[CTS] skip image tests if images are not supported

igchor · igchor · commit 9f5e0dcaa323 · 2024-11-18T23:12:23.000Z
diff --git a/test/conformance/memory/memory_adapter_level_zero_v2.match b/test/conformance/memory/memory_adapter_level_zero_v2.match
diff --git a/test/conformance/memory/urMemImageCreateWithImageFormatParam.cpp b/test/conformance/memory/urMemImageCreateWithImageFormatParam.cpp
@@ -110,6 +110,10 @@ TEST_P(urMemImageCreateTestWithImageFormatParam, Success) {
         }
     }
 
+    if (res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
+        GTEST_SKIP() << "urMemImageCreate not supported";
+    }
+
     if (!is_primary_image_format &&
         res == UR_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT) {
         GTEST_SKIP();
diff --git a/test/conformance/memory/urMemImageCreateWithNativeHandle.cpp b/test/conformance/memory/urMemImageCreateWithNativeHandle.cpp
@@ -10,7 +10,7 @@ UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urMemImageCreateWithNativeHandleTest);
 
 TEST_P(urMemImageCreateWithNativeHandleTest, Success) {
     ur_native_handle_t native_handle = 0;
-    ASSERT_SUCCESS(urMemGetNativeHandle(image, device, &native_handle));
+    UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urMemGetNativeHandle(image, device, &native_handle));
 
     ur_mem_handle_t mem = nullptr;
     ASSERT_SUCCESS(urMemImageCreateWithNativeHandle(

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,10 @@ TEST_P(urMemImageCreateTestWithImageFormatParam, Success) {`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
	`113`	`+ if (res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {`
	`114`	`+ GTEST_SKIP() << "urMemImageCreate not supported";`
	`115`	`+ }`
	`116`	`+`
`113`	`117`	`if (!is_primary_image_format &&`
`114`	`118`	`res == UR_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT) {`
`115`	`119`	`GTEST_SKIP();`