run_project_tests: Plumb test category name down into TestDef

Unfortunately, the idiot who wrote bee4dc9f (me!) assumed that the 'test
category' (the 'testsuite' name) is the same as the directory. (That is,
that TestCategory.category == TestCategory.subdir).

These are not the same (e.g. 'failing-test' vs 'failing test' etc.)
which is why they are separate things.

Rather than adding yet another function argument to pass yet another
attribute of the TestCategory object around, just pass the object itself.

run_project_tests.py

@@ -269,17 +269,17 @@ class InstalledFile:
 
 @functools.total_ordering
 class TestDef:
-    def __init__(self, path: Path, name: T.Optional[str], args: T.List[str], skip: bool = False, skip_category: bool = False):
-        self.category = path.parts[1]
-        self.path = path
-        self.name = name
+    def __init__(self, path: Path, name: T.Optional[str], args: T.List[str], skip: bool, category: TestCategory):
+        self.category = category.category
+        self.path: Path = path
+        self.name = name  # matrix instance name or None
         self.args = args
         self.skip = skip
         self.env = os.environ.copy()
         self.installed_files: T.List[InstalledFile] = []
         self.do_not_set_opts: T.List[str] = []
         self.stdout: T.List[T.Dict[str, str]] = []
-        self.skip_category = skip_category
+        self.skip_category = category.skip
         self.skip_expected = False
         self.cleanup: T.List[str] = []
 
@@ -829,7 +829,7 @@ def _skip_keys(test_def: T.Dict) -> T.Tuple[bool, bool]:
     return (skip, skip_expected)
 
 
-def load_test_json(t: TestDef, stdout_mandatory: bool, skip_category: bool = False) -> T.List[TestDef]:
+def load_test_json(t: TestDef, c: TestCategory) -> T.List[TestDef]:
     all_tests: T.List[TestDef] = []
     test_def = {}
     test_def_file = t.path / 'test.json'
@@ -853,7 +853,7 @@ def load_test_json(t: TestDef, stdout_mandatory: bool, skip_category: bool = Fal
 
     # Handle expected output
     stdout = test_def.get('stdout', [])
-    if stdout_mandatory and not stdout:
+    if c.stdout_mandatory and not stdout:
         raise RuntimeError(f"{test_def_file} must contain a non-empty stdout key")
 
     # Handle the do_not_set_opts list
@@ -942,7 +942,7 @@ def load_test_json(t: TestDef, stdout_mandatory: bool, skip_category: bool = Fal
         opts = [f'-D{x[0]}={x[1]}' for x in i if x[1] is not None]
         skip = any([x[2] for x in i])
         skip_expected = any([x[3] for x in i])
-        test = TestDef(t.path, name, opts, skip or t.skip, skip_category)
+        test = TestDef(t.path, name, opts, skip or t.skip, c)
         test.env.update(env)
         test.installed_files = installed
         test.do_not_set_opts = do_not_set_opts
@@ -955,7 +955,7 @@ def load_test_json(t: TestDef, stdout_mandatory: bool, skip_category: bool = Fal
     return all_tests
 
 
-def gather_tests(testdir: Path, stdout_mandatory: bool, only: T.List[str], skip_category: bool) -> T.List[TestDef]:
+def gather_tests(testdir: Path, category: TestCategory, only: T.List[str]) -> T.List[TestDef]:
     all_tests: T.List[TestDef] = []
     for t in testdir.iterdir():
         # Filter non-tests files (dot files, etc)
@@ -965,8 +965,8 @@ def gather_tests(testdir: Path, stdout_mandatory: bool, only: T.List[str], skip_
             continue
         if only and not any(t.name.startswith(prefix) for prefix in only):
             continue
-        test_def = TestDef(t, None, [], skip_category=skip_category)
-        all_tests.extend(load_test_json(test_def, stdout_mandatory, skip_category))
+        test_def = TestDef(t, None, [], False, category)
+        all_tests.extend(load_test_json(test_def, category))
     return sorted(all_tests)
 
 
@@ -1019,6 +1019,13 @@ def should_skip_wayland() -> bool:
         return True
     return False
 
+class TestCategory:
+    def __init__(self, category: str, subdir: str, skip: bool = False, stdout_mandatory: bool = False):
+        self.category = category                  # category name
+        self.subdir = subdir                      # subdirectory
+        self.skip = skip                          # skip condition
+        self.stdout_mandatory = stdout_mandatory  # expected stdout is mandatory for tests in this category
+
 def detect_tests_to_run(only: T.Dict[str, T.List[str]], use_tmp: bool) -> T.List[T.Tuple[str, T.List[TestDef], bool]]:
     """
     Parameters
@@ -1036,13 +1043,6 @@ def detect_tests_to_run(only: T.Dict[str, T.List[str]], use_tmp: bool) -> T.List
                   'cmake' not in tool_vers_map or
                   not mesonlib.version_compare(tool_vers_map['cmake'], '>=3.14'))
 
-    class TestCategory:
-        def __init__(self, category: str, subdir: str, skip: bool = False, stdout_mandatory: bool = False):
-            self.category = category                  # category name
-            self.subdir = subdir                      # subdirectory
-            self.skip = skip                          # skip condition
-            self.stdout_mandatory = stdout_mandatory  # expected stdout is mandatory for tests in this category
-
     all_tests = [
         TestCategory('cmake', 'cmake', skip_cmake),
         TestCategory('common', 'common'),
@@ -1086,7 +1086,7 @@ def detect_tests_to_run(only: T.Dict[str, T.List[str]], use_tmp: bool) -> T.List
     if only:
         all_tests = [t for t in all_tests if t.category in only]
 
-    gathered_tests = [(t.category, gather_tests(Path('test cases', t.subdir), t.stdout_mandatory, only[t.category], t.skip), t.skip) for t in all_tests]
+    gathered_tests = [(t.category, gather_tests(Path('test cases', t.subdir), t, only[t.category]), t.skip) for t in all_tests]
     return gathered_tests
 
 def run_tests(all_tests: T.List[T.Tuple[str, T.List[TestDef], bool]],

run_single_test.py

@@ -15,7 +15,7 @@ import typing as T
 from mesonbuild import mlog
 from mesonbuild.mesonlib import is_windows
 from run_tests import handle_meson_skip_test
-from run_project_tests import TestDef, load_test_json, run_test, BuildStep
+from run_project_tests import TestDef, TestCategory, load_test_json, run_test, BuildStep
 from run_project_tests import setup_commands, detect_system_compiler, detect_tools
 from run_project_tests import scan_test_data_symlinks, setup_symlinks, clear_transitive_files
 
@@ -54,8 +54,9 @@ def main() -> None:
         detect_system_compiler(args)
     detect_tools(not args.quick)
 
-    test = TestDef(args.case, args.case.stem, [])
-    tests = load_test_json(test, False)
+    cat = TestCategory(args.case.stem, args.case.stem, False, False)
+    test = TestDef(args.case, None, [], False, cat)
+    tests = load_test_json(test, cat)
     if args.subtests:
         tests = [t for i, t in enumerate(tests) if i in args.subtests]