Change SYCL_PI_TESTS to SYCL_UR_TESTS in CI (#16010)

`SYCL_PI_TESTS` was deprecated and changed to `SYCL_UR_TESTS`.
intel · Nov 11, 2024 · ac3a03e · ac3a03e
1 parent 6d1f4fc
commit ac3a03e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml
@@ -169,7 +169,6 @@ jobs:
           --cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           --cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
           --cmake-opt="-DNATIVECPU_USE_OCK=Off" \
-          --cmake-opt="-DSYCL_PI_TESTS=OFF" \
           --cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV"
     - name: Compile
       id: build

diff --git a/.github/workflows/sycl-macos-build-and-test.yml b/.github/workflows/sycl-macos-build-and-test.yml
@@ -52,7 +52,6 @@ jobs:
           --ci-defaults $ARGS \
           --cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache \
           --cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-          --cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
-          --cmake-opt="-DSYCL_PI_TESTS=OFF"
+          --cmake-opt="-DLLVM_INSTALL_UTILS=ON"
     - name: Compile
       run: cmake --build $GITHUB_WORKSPACE/build --target deploy-sycl-toolchain
diff --git a/sycl/unittests/CMakeLists.txt b/sycl/unittests/CMakeLists.txt
@@ -25,13 +25,7 @@ include(AddSYCLUnitTest)
 
 add_custom_target(check-sycl-unittests)
 
-# TODO UR tests require real hardware and must be moved to sycl/test-e2e.
-option(SYCL_UR_TESTS "Enable UR-specific unit tests" OFF)
-
-if (SYCL_UR_TESTS)
-    add_subdirectory(ur)
-endif()
-
+add_subdirectory(ur)
 add_subdirectory(allowlist)
 add_subdirectory(config)
 add_subdirectory(misc)