[CTS] skip image tests if images are not supported

Author: igchor

test/conformance/memory/memory_adapter_level_zero_v2.match

@@ -4,7 +4,6 @@ urMemBufferPartitionTest.InvalidValueCreateType/*
 urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/*
 urMemGetInfoTestWithParam.Success/*
 urMemGetInfoTest.InvalidSizeSmall/*
-urMemImageCreateTestWithImageFormatParam.Success/*
 urMemReleaseTest.Success/*
 urMemReleaseTest.CheckReferenceCount/*
 urMemRetainTest.Success/*

test/conformance/memory/memory_adapter_native_cpu.match

@@ -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();

test/conformance/memory/urMemImageCreateWithImageFormatParam.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(

test/conformance/memory/urMemImageCreateWithNativeHandle.cpp

@@ -209,9 +209,9 @@ struct urMemImageTest : urContextTest {
         if (!imageSupported) {
             GTEST_SKIP();
         }
-        ASSERT_SUCCESS(urMemImageCreate(context, UR_MEM_FLAG_READ_WRITE,
-                                        &image_format, &image_desc, nullptr,
-                                        &image));
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+            urMemImageCreate(context, UR_MEM_FLAG_READ_WRITE, &image_format,
+                             &image_desc, nullptr, &image));
     }
 
     void TearDown() override {
@@ -323,8 +323,9 @@ template <class T> struct urMemImageTestWithParam : urContextTestWithParam<T> {
         if (!imageSupported) {
             GTEST_SKIP();
         }
-        ASSERT_SUCCESS(urMemImageCreate(this->context, UR_MEM_FLAG_READ_WRITE,
-                                        &format, &desc, nullptr, &image));
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+            urMemImageCreate(this->context, UR_MEM_FLAG_READ_WRITE, &format,
+                             &desc, nullptr, &image));
         ASSERT_NE(nullptr, image);
     }