Remove unsplit name

Author: ayylol

sycl/test-e2e/format.py

@@ -154,14 +154,11 @@ def execute(self, test, litConfig):
         if isinstance(script, lit.Test.Result):
             return script
 
-        unsplit_test = False
-        if "build-and-run-mode" in test.requires:
-            unsplit_test = True
-
         devices_for_test = []
         triples = set()
+        ignore_line_filtering = False
         if test.config.test_mode == "build-only":
-            if unsplit_test or "true" in test.unsupported:
+            if "build-and-run-mode" in test.requires or "true" in test.unsupported:
                 return lit.Test.Result(
                     lit.Test.UNSUPPORTED, "Test unsupported for this environment"
                 )
@@ -177,6 +174,10 @@ def execute(self, test, litConfig):
                 (backend, _) = sycl_device.split(":")
                 triples.add(get_triple(test, backend))
 
+            if "build-and-run-mode" in test.requires and test.config.fallback_build_run_only:
+                ignore_line_filtering = True
+
+
         substitutions = lit.TestRunner.getDefaultSubstitutions(test, tmpDir, tmpBase)
         substitutions.append(("%{sycl_triple}", format(",".join(triples))))
         # -fsycl-targets is needed for CUDA/HIP, so just use it be default so
@@ -239,7 +240,7 @@ def get_extra_env(sycl_devices):
                 continue
 
             # Filter commands based on split-mode
-            is_run_line = (unsplit_test and test.config.fallback_build_run_only) or any(
+            is_run_line = ignore_line_filtering or any(
                 i in directive.command
                 for i in ["%{run}", "%{run-unfiltered-devices}", "%if run-mode"]
             )

sycl/test-e2e/lit.cfg.py

@@ -39,13 +39,13 @@
 
 # test-mode: Set if tests should run normally or only build/run
 config.test_mode = lit_config.params.get("test-mode", "full")
+config.fallback_build_run_only = False
 if config.test_mode == "full":
     config.available_features.add("run-mode")
     config.available_features.add("build-and-run-mode")
 elif config.test_mode == "run-only":
     lit_config.note("run-only test mode enabled, only executing tests")
     config.available_features.add("run-mode")
-    config.fallback_build_run_only = False
     if lit_config.params.get("build-instead-of-skip-run-only", False):
         config.available_features.add("build-and-run-mode")
         config.fallback_build_run_only = True