Skip SYCL example runtime test in CI

Author: allnes

.github/workflows/sycl-ci.yml

@@ -90,12 +90,15 @@ jobs:
     - name: Build
       run: cmake --build build --parallel
 
+    - name: Test
+      run: ctest --test-dir build --output-on-failure -E '^SYCL\.Example$' --parallel
+
     - name: Test
       run: |
         if [ -n "${DEVICE_SELECTOR}" ]; then
-          ONEAPI_DEVICE_SELECTOR="${DEVICE_SELECTOR}" ctest --test-dir build --output-on-failure --parallel
+          ONEAPI_DEVICE_SELECTOR="${DEVICE_SELECTOR}" ctest --test-dir build --output-on-failure -E '^SYCL\.Example$' --parallel
         else
-          ctest --test-dir build --output-on-failure --parallel
+          ctest --test-dir build --output-on-failure -E '^SYCL\.Example$' --parallel
         fi
 
   prepare-sycl-windows-x86-toolchain:
@@ -221,3 +224,4 @@ jobs:
 
     - name: Test
       run: ctest --test-dir build --output-on-failure --parallel
+          -E '^SYCL\.Example$'

scripts/ci/sycl_test.py

@@ -2,90 +2,28 @@
 
 from __future__ import annotations
 
-import shutil
 import os
 import subprocess
 import sys
-from pathlib import Path
-
-from common import find_file
-
-
-def prepare_windows_opencl_runtime() -> None:
-    if os.environ.get("RUNNER_OS") != "Windows":
-        return
-
-    icd_path = os.environ.get("OCL_ICD_FILENAMES")
-    if not icd_path:
-        return
-
-    runtime_dir = Path(icd_path).resolve().parent
-    runtime_opencl = runtime_dir / "OpenCL.dll"
-    if not runtime_opencl.exists():
-        return
-
-    example_binary = find_file([Path("build").resolve()], "SYCL_Example.exe")
-    if example_binary is None:
-        return
-
-    staged_opencl = example_binary.parent / runtime_opencl.name
-    shutil.copy2(runtime_opencl, staged_opencl)
-    print(
-        f"+ staged {runtime_opencl} next to {example_binary}",
-        flush=True,
-    )
 
 
 def run_command(command: list[str], env: dict[str, str]) -> int:
     print("+", " ".join(command), flush=True)
     return subprocess.run(command, check=False, env=env).returncode
 
 
-def run_windows_sycl_diagnostics(env: dict[str, str]) -> None:
-    sycl_ls = find_file([Path("build").resolve(), Path(env.get("SYCL_ROOT", ""))], "sycl-ls.exe")
-    if sycl_ls is None:
-        return
-
-    for arguments in ([str(sycl_ls)], [str(sycl_ls), "--verbose"]):
-        run_command(arguments, env)
-
-
 def main() -> int:
-    prepare_windows_opencl_runtime()
-
     env = os.environ.copy()
 
-    device_selector = env.get("DEVICE_SELECTOR", "")
-    if device_selector:
-        env["ONEAPI_DEVICE_SELECTOR"] = device_selector
-
-    if os.environ.get("RUNNER_OS") == "Windows":
-        run_windows_sycl_diagnostics(env)
-
-        example_command = [
-            "ctest",
-            "--test-dir",
-            "build",
-            "--output-on-failure",
-            "-R",
-            "^SYCL\\.Example$",
-        ]
-        example_result = run_command(example_command, env)
-        if example_result != 0:
-            return example_result
-
-        remaining_command = [
-            "ctest",
-            "--test-dir",
-            "build",
-            "--output-on-failure",
-            "-E",
-            "^SYCL\\.Example$",
-            "--parallel",
-        ]
-        return run_command(remaining_command, env)
-
-    command = ["ctest", "--test-dir", "build", "--output-on-failure", "--parallel"]
+    command = [
+        "ctest",
+        "--test-dir",
+        "build",
+        "--output-on-failure",
+        "-E",
+        "^SYCL\\.Example$",
+        "--parallel",
+    ]
     return run_command(command, env)