Bump Catch2 to d548be26 for new SKIP macro

docs/README.adoc

@@ -345,6 +345,12 @@ where `<impls...>` is a comma-separated list of `hipSYCL`, `ComputeCpp` and/or `
 
 NOTE: #**TODO:** Custom matchers.#
 
+=== Testing Optional Features
+
+The CTS may include tests that cannot be executed in all circumstances.
+Examples of such tests include tests for optional features, tests that depend on certain device capabilities, tests that require multiple devices as well as tests for vendor extensions.
+In such scenarios, Catch2's `SKIP` macro should be used to explicitly report a test case as skipped.
+
 === Best Practices
 
 Here is a list of best practices for writing test cases.

tests/cuda_interop/cuda_backend_avail.cpp

@@ -27,6 +27,6 @@ TEST_CASE("CUDA backend availability test") {
   INFO("Checking sycl::backend::cuda is available");
   REQUIRE(q.get_backend() == sycl::backend::cuda);
 #else
-  INFO("The test is skipped because CUDA back-end is not supported");
+  SKIP("CUDA backend is not supported");
 #endif  // SYCL_BACKEND_CUDA
 }

tests/cuda_interop/cuda_interop_constructors.cpp

@@ -128,6 +128,6 @@ TEST_CASE("CUDA interop constructor test") {
     CHECK(interopEvent == cuEvent);
   }
 #else
-  INFO("The test is skipped because CUDA back-end is not supported");
+  SKIP("CUDA backend is not supported");
 #endif  // SYCL_BACKEND_CUDA
 }

tests/cuda_interop/cuda_interop_device_function.cu

@@ -86,6 +86,6 @@ TEST_CASE("CUDA interop device function test") {
   test_device_function_buffer<int>(queue, "int");
   test_device_function_local<int>(queue, "int");
 #else
-  INFO("The test is skipped because CUDA back-end is not supported");
+  SKIP("CUDA backend is not supported");
 #endif  // SYCL_BACKEND_CUDA
 }

tests/cuda_interop/cuda_interop_get.cpp

@@ -66,6 +66,6 @@ TEST_CASE("CUDA interop get test") {
     check_return_type<CUevent>(interopEvent, "get_native(event)");
   }
 #else
-  INFO("The test is skipped because CUDA back-end is not supported");
+  SKIP("CUDA backend is not supported");
 #endif  // SYCL_BACKEND_CUDA
 };

tests/cuda_interop/cuda_interop_kernel.cpp

@@ -31,6 +31,6 @@ TEST_CASE("CUDA interop kernel test") {
   run_all_tests<c2> tests_c2;
   tests_c2(queue, "class with default constructor");
 #else
-  INFO("The test is skipped because CUDA back-end is not supported");
+  SKIP("CUDA backend is not supported");
 #endif  // SYCL_BACKEND_CUDA
 }

tests/extension/oneapi_device_global/device_global_api_arrow_operator.cpp

@@ -132,9 +132,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     check_device_global_api_arrow_operator_for_type<
         user_def_types::arrow_operator_overloaded>{}(log, "arrow_operator");

tests/extension/oneapi_device_global/device_global_api_basic.cpp

@@ -494,9 +494,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_api_basic_for_type>(types, log);

tests/extension/oneapi_device_global/device_global_api_subscript_operator.cpp

@@ -150,9 +150,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_api_subscript_operator_for_type>(types,

tests/extension/oneapi_device_global/device_global_exceptions.cpp

@@ -284,9 +284,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_handler_queue_exceptions>(types, log);

tests/extension/oneapi_device_global/device_global_functional_define_various_ways.cpp

@@ -134,9 +134,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_define_various_ways>(types, log);

tests/extension/oneapi_device_global/device_global_functional_kernel_bundle.cpp

@@ -174,9 +174,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_kernel_bundle>(types, log);

tests/extension/oneapi_device_global/device_global_functional_one_kernel.cpp

@@ -235,9 +235,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_one_kernel_for_type>(types, log);

tests/extension/oneapi_device_global/device_global_functional_pass_pointer.cpp

@@ -126,9 +126,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_pass_pointer>(types, log);

tests/extension/oneapi_device_global/device_global_functional_several_kernels_one_device.cpp

@@ -144,9 +144,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_serveal_kernels_one_device_for_type>(

tests/extension/oneapi_device_global/device_global_functional_spec_constants.cpp

@@ -168,9 +168,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_spec_constants>(types, log);

tests/extension/oneapi_device_global/device_global_functional_unique_for_every_device.cpp

@@ -187,9 +187,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_serveal_kernels_one_device_for_type>(

tests/extension/oneapi_device_global/device_global_functional_variables_with_same_name.cpp

@@ -114,9 +114,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_kernel_bundle>(types, log);

tests/extension/oneapi_device_global/device_global_handler_copy_memcpy_overloads.cpp

@@ -431,9 +431,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_device_global_handler_functions_overloads>(types, log);

tests/extension/oneapi_device_global/device_global_queue_array_copy.cpp

@@ -130,9 +130,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_queue_overloads_for_device_global_array_for_type>(types,

tests/extension/oneapi_device_global/device_global_queue_copy.cpp

@@ -240,9 +240,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_queue_overloads_for_device_global_for_type>(types, log);

tests/extension/oneapi_device_global/device_global_queue_memcpy.cpp

@@ -254,9 +254,9 @@ class TEST_NAME : public sycl_cts::util::test_base {
    */
   void run(util::logger& log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     auto types = device_global_types::get_types();
     for_all_types<check_queue_memcpy_overloads_for_type>(types, log);

tests/extension/oneapi_properties/properties_different_order.cpp

@@ -29,9 +29,9 @@ class TEST_NAME : public util::test_base {
    */
   void run(util::logger &log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     {
       using namespace sycl::ext::oneapi::experimental;

tests/extension/oneapi_properties/properties_has_property.cpp

@@ -28,9 +28,9 @@ class TEST_NAME : public util::test_base {
    */
   void run(util::logger &log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     {
       using namespace sycl::ext::oneapi::experimental;

tests/extension/oneapi_properties/properties_is_device_copyable.cpp

@@ -28,9 +28,9 @@ class TEST_NAME : public util::test_base {
    */
   void run(util::logger &log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     {
       using namespace sycl::ext::oneapi::experimental;

tests/extension/oneapi_properties/properties_is_property_check.cpp

@@ -28,9 +28,9 @@ class TEST_NAME : public util::test_base {
    */
   void run(util::logger &log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     {
       using namespace sycl::ext::oneapi::experimental;

tests/extension/oneapi_properties/properties_is_property_list.cpp

@@ -30,9 +30,9 @@ class TEST_NAME : public util::test_base {
    */
   void run(util::logger &log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     {
       using namespace sycl::ext::oneapi::experimental;

tests/extension/oneapi_properties/properties_prop_eq_op.cpp

@@ -28,9 +28,9 @@ class TEST_NAME : public util::test_base {
    */
   void run(util::logger &log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     {
       using namespace sycl::ext::oneapi::experimental;

tests/extension/oneapi_properties/properties_property_value.cpp

@@ -67,9 +67,9 @@ class TEST_NAME : public util::test_base {
    */
   void run(util::logger &log) override {
 #if !defined(SYCL_EXT_ONEAPI_PROPERTIES)
-    WARN("SYCL_EXT_ONEAPI_PROPERTIES is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_PROPERTIES is not defined");
 #elif !defined(SYCL_EXT_ONEAPI_DEVICE_GLOBAL)
-    WARN("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_DEVICE_GLOBAL is not defined");
 #else
     {
       properties props{device_image_scope};

tests/extension/oneapi_sub_group_mask/sub_group_mask_all.cpp

@@ -65,7 +65,7 @@ class TEST_NAME : public util::test_base {
     log.note("Check all() for mask with true predicate");
     check_diff_sub_group_sizes<verification_func_for_true_predicate>(log);
 #else
-    log.note("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
   }
 };

tests/extension/oneapi_sub_group_mask/sub_group_mask_any.cpp

@@ -66,7 +66,7 @@ class TEST_NAME : public util::test_base {
     check_diff_sub_group_sizes<verification_func_for_false_predicate>(log);
 
 #else
-    log.note("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
   }
 };

tests/extension/oneapi_sub_group_mask/sub_group_mask_count.cpp

@@ -51,7 +51,7 @@ class TEST_NAME : public util::test_base {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
     check_diff_sub_group_sizes<verification_func_for_first_half_predicate>(log);
 #else
-    log.note("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
   }
 };

tests/extension/oneapi_sub_group_mask/sub_group_mask_extract_bits.cpp

@@ -89,7 +89,7 @@ class TEST_NAME : public util::test_base {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
     for_all_types_and_marrays<check_for_type>(types, log);
 #else
-    log.note("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
   }
 };

tests/extension/oneapi_sub_group_mask/sub_group_mask_find_high.cpp

@@ -71,7 +71,7 @@ class TEST_NAME : public util::test_base {
     log.note("Check find_high() for mask with false predicate");
     check_diff_sub_group_sizes<verification_func_for_false_predicate>(log);
 #else
-    log.note("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
   }
 };

tests/extension/oneapi_sub_group_mask/sub_group_mask_find_low.cpp

@@ -71,7 +71,7 @@ class TEST_NAME : public util::test_base {
     log.note("Check find_low() for mask with false predicate");
     check_diff_sub_group_sizes<verification_func_for_false_predicate>(log);
 #else
-    log.note("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
   }
 };

tests/extension/oneapi_sub_group_mask/sub_group_mask_flip_api.cpp

@@ -60,7 +60,7 @@ class TEST_NAME : public util::test_base {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
     check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
 #else
-    log.note("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined, test is skipped");
+    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
   }
 };