Merge pull request #1889 from pbalcer/fix-sampler-fixture

fix sampler test fixture

Author: pbalcer

test/conformance/sampler/sampler_adapter_native_cpu.match

@@ -1,19 +0,0 @@
-urSamplerCreateWithNativeHandleTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerGetInfoTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_SAMPLER_INFO_REFERENCE_COUNT
-urSamplerGetInfoTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_SAMPLER_INFO_CONTEXT
-urSamplerGetInfoTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_SAMPLER_INFO_NORMALIZED_COORDS
-urSamplerGetInfoTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_SAMPLER_INFO_ADDRESSING_MODE
-urSamplerGetInfoTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_SAMPLER_INFO_FILTER_MODE
-urSamplerGetInfoTest.InvalidNullHandleSampler/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerGetInfoTest.InvalidEnumerationInfo/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerGetInfoTest.InvalidNullPointerPropSizeRet/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerGetInfoTest.InvalidNullPointerPropValue/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerGetInfoTest.InvalidSizePropSizeZero/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerGetInfoTest.InvalidSizePropSizeSmall/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerGetNativeHandleTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerGetNativeHandleTest.InvalidNullHandleSampler/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerGetNativeHandleTest.InvalidNullPointerNativeHandle/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerReleaseTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerReleaseTest.InvalidNullHandleSampler/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerRetainTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
-urSamplerRetainTest.InvalidNullHandleSampler/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}

test/conformance/testing/include/uur/fixtures.h

@@ -159,15 +159,21 @@ struct urSamplerTest : urContextTest {
             UR_SAMPLER_ADDRESSING_MODE_CLAMP, /* addressing mode */
             UR_SAMPLER_FILTER_MODE_LINEAR,    /* filterMode */
         };
-        ASSERT_SUCCESS(urSamplerCreate(context, &sampler_desc, &sampler));
+        auto ret = urSamplerCreate(context, &sampler_desc, &sampler);
+        if (ret == UR_RESULT_ERROR_UNSUPPORTED_FEATURE ||
+            ret == UR_RESULT_ERROR_UNINITIALIZED) {
+            GTEST_SKIP() << "urSamplerCreate not supported";
+        }
     }
 
     void TearDown() override {
-        EXPECT_SUCCESS(urSamplerRelease(sampler));
+        if (sampler) {
+            EXPECT_SUCCESS(urSamplerRelease(sampler));
+        }
         UUR_RETURN_ON_FATAL_FAILURE(urContextTest::TearDown());
     }
 
-    ur_sampler_handle_t sampler;
+    ur_sampler_handle_t sampler = nullptr;
     ur_sampler_desc_t sampler_desc;
 };
 
@@ -263,15 +269,22 @@ template <class T> struct urSamplerTestWithParam : urContextTestWithParam<T> {
             UR_SAMPLER_ADDRESSING_MODE_CLAMP, /* addressing mode */
             UR_SAMPLER_FILTER_MODE_LINEAR,    /* filterMode */
         };
-        ASSERT_SUCCESS(urSamplerCreate(this->context, &sampler_desc, &sampler));
+        auto ret = urSamplerCreate(this->context, &sampler_desc, &sampler);
+        if (ret == UR_RESULT_ERROR_UNSUPPORTED_FEATURE ||
+            ret == UR_RESULT_ERROR_UNINITIALIZED) {
+            GTEST_SKIP() << "urSamplerCreate not supported";
+        }
     }
 
     void TearDown() override {
-        EXPECT_SUCCESS(urSamplerRelease(sampler));
+        if (sampler) {
+            EXPECT_SUCCESS(urSamplerRelease(sampler));
+        }
+
         UUR_RETURN_ON_FATAL_FAILURE(urContextTestWithParam<T>::TearDown());
     }
 
-    ur_sampler_handle_t sampler;
+    ur_sampler_handle_t sampler = nullptr;
     ur_sampler_desc_t sampler_desc;
 };