discover suites

Author: RazvanLiviuVarzaru

configuration/builders/definitions/foundry/foundry.yaml

@@ -2,6 +2,9 @@
 # Plugins registered in https://github.com/vuvova/foundry (one top-level
 # directory each). Selectable via foundry_force_scheduler's "plugin" param
 # and passed straight to "cmake -P run.cmake <plugin>" in the child builders.
+# Note: the plugin's installed MTR "plugin/<name>/suite/" directory isn't
+# necessarily named the same (e.g. tidesql's CMake target is "tidesdb") --
+# RunPluginMTRSuite discovers that at runtime rather than assuming it matches.
 plugins:
   - disabled-functions
   - levenshtein

configuration/steps/commands/foundry.py

@@ -62,20 +62,26 @@ def as_cmd_arg(self) -> list[str]:
 class RunPluginMTRSuite(Command):
     # MARIADB_ADD_PLUGIN's INSTALL_MYSQL_TEST (cmake/plugin.cmake) always
     # installs a plugin's mysql-test/ contents -- suite/ included -- under
-    # <mtr_base_dir>/plugin/<plugin>/, so the suite ends up at
-    # plugin/<plugin>/suite/<name>, not plugin/<plugin>/<name>. mtr_cases.pm's
-    # short-name lookup for `--suite=NAME` doesn't account for that extra
-    # suite/ level, so we pass MTR the full relative path instead, which it
-    # accepts directly. A plugin with no suite/ dir at all is skipped rather
-    # than failing the build.
+    # <mtr_base_dir>/plugin/<X>/, so the suite ends up at
+    # plugin/<X>/suite/<name>, not plugin/<X>/<name>. <X> is the plugin's own
+    # CMake project/target name, which isn't always the same as the Foundry
+    # "plugin" property (e.g. tidesql's CMake target is actually "tidesdb"),
+    # so rather than guess it, discover whatever actually landed under
+    # plugin/*/suite/* -- exactly one plugin gets installed per build.
+    # mtr_cases.pm's short-name lookup for `--suite=NAME` doesn't account for
+    # the extra suite/ level either way, so we pass MTR the full relative
+    # path instead, which it accepts directly. A plugin with no suite/ dir
+    # at all is skipped rather than failing the build.
     def __init__(self, package_type: str, workdir: PurePath = PurePath(".")):
         self.package_type = package_type
         super().__init__(name="Run plugin MTR suite", workdir=workdir, user="root")
 
     def as_cmd_arg(self) -> list[str]:
         # Ask the package manager where MariaDB-test/mariadb-test actually
-        # put mysql-test-run.pl, rather than guessing a path -- it's moved
-        # across MariaDB package versions/layouts before.
+        # put mariadb-test-run.pl, rather than guessing a path -- it's moved
+        # across MariaDB package versions/layouts before. Match the current
+        # top-level script by name, and exclude lib/v1/ specifically -- it
+        # bundles its own legacy-named mysql-test-run.pl that isn't it.
         if self.package_type == "RPM":
             list_files_cmd = "rpm -ql MariaDB-test"
         else:
@@ -87,27 +93,31 @@ def as_cmd_arg(self) -> list[str]:
                 f"""
 set -euo pipefail
 
-mtr_script=$({list_files_cmd} | grep -m1 '/mysql-test-run\\.pl$' || true)
+mtr_script=$({list_files_cmd} | grep -v '/lib/v1/' | grep -m1 '/mariadb-test-run\\.pl$' || true)
 if [ -z "$mtr_script" ]; then
-    echo "Could not locate mysql-test-run.pl from the installed test package" >&2
+    echo "Could not locate mariadb-test-run.pl from the installed test package" >&2
     exit 1
 fi
 mtr_base_dir=$(dirname "$mtr_script")
 
-plugin_suite_dir="$mtr_base_dir/plugin/%(prop:plugin)s/suite"
-if [ ! -d "$plugin_suite_dir" ]; then
-    echo "No MTR suite found for plugin %(prop:plugin)s -- skipping"
-    exit 0
-fi
-
 suites=""
-for d in "$plugin_suite_dir"/*/; do
-    name=$(basename "$d")
-    suites="$suites,plugin/%(prop:plugin)s/suite/$name"
+for suite_dir in "$mtr_base_dir"/plugin/*/suite; do
+    [ -d "$suite_dir" ] || continue
+    plugin_dir=$(basename "$(dirname "$suite_dir")")
+    for d in "$suite_dir"/*/; do
+        [ -d "$d" ] || continue
+        name=$(basename "$d")
+        suites="$suites,plugin/$plugin_dir/suite/$name"
+    done
 done
 suites=$(echo "$suites" | sed 's/^,//')
 
-cd "$mtr_base_dir" && perl mysql-test-run.pl --force --max-test-fail=20 --suite="$suites" --vardir=/home/buildbot
+if [ -z "$suites" ]; then
+    echo "No MTR suite found for plugin %(prop:plugin)s -- skipping"
+    exit 0
+fi
+
+cd "$mtr_base_dir" && perl mariadb-test-run.pl --force --max-test-fail=20 --suite="$suites" --vardir=/home/buildbot
 """
             ),
         ]