Add more coverage to CTS tests

omarahmed1111 · omarahmed1111 · commit 6e8b89b2a85c · 2024-05-22T10:50:38.000+01:00
diff --git a/test/conformance/context/context_adapter_cuda.match b/test/conformance/context/context_adapter_cuda.match
@@ -1 +0,0 @@
-urContextCreateWithNativeHandleTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
diff --git a/test/conformance/context/context_adapter_hip.match b/test/conformance/context/context_adapter_hip.match
@@ -1,2 +1,4 @@
 urContextCreateWithNativeHandleTest.Success/AMD_HIP_BACKEND___{{.*}}_
+urContextCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle/AMD_HIP_BACKEND___{{.*}}_
+urContextCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/AMD_HIP_BACKEND___{{.*}}_
 urContextGetInfoTestWithInfoParam.Success/AMD_HIP_BACKEND___{{.*}}
diff --git a/test/conformance/context/context_adapter_level_zero.match b/test/conformance/context/context_adapter_level_zero.match
@@ -1 +1,2 @@
+urContextCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 urContextSetExtendedDeleterTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
diff --git a/test/conformance/context/context_adapter_native_cpu.match b/test/conformance/context/context_adapter_native_cpu.match
@@ -1 +1,3 @@
+urContextCreateWithNativeHandleTest.InvalidNullPointerDevices/SYCL_NATIVE_CPU___SYCL_Native_CPU_
+urContextCreateWithNativeHandleTest.InvalidNullPointerContext/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urContextSetExtendedDeleterTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
diff --git a/test/conformance/context/urContextCreateWithNativeHandle.cpp b/test/conformance/context/urContextCreateWithNativeHandle.cpp
@@ -10,8 +10,9 @@ UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urContextCreateWithNativeHandleTest);
 
 TEST_P(urContextCreateWithNativeHandleTest, Success) {
     ur_native_handle_t native_context = nullptr;
-    if (urContextGetNativeHandle(context, &native_context)) {
-        GTEST_SKIP();
+    {
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+            urContextGetNativeHandle(context, &native_context));
     }
 
     // We cannot assume anything about a native_handle, not even if it's
@@ -20,8 +21,8 @@ TEST_P(urContextCreateWithNativeHandleTest, Success) {
     // and perform some query on it to verify that it works.
     ur_context_handle_t ctx = nullptr;
     ur_context_native_properties_t props{};
-    ASSERT_SUCCESS(urContextCreateWithNativeHandle(native_context, 1, &device,
-                                                   &props, &ctx));
+    UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urContextCreateWithNativeHandle(
+        native_context, 1, &device, &props, &ctx));
     ASSERT_NE(ctx, nullptr);
 
     uint32_t n_devices = 0;
@@ -30,3 +31,64 @@ TEST_P(urContextCreateWithNativeHandleTest, Success) {
 
     ASSERT_SUCCESS(urContextRelease(ctx));
 }
+
+TEST_P(urContextCreateWithNativeHandleTest, SuccessWithOwnedNativeHandle) {
+    ur_native_handle_t native_context = nullptr;
+    {
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+            urContextGetNativeHandle(context, &native_context));
+    }
+
+    ur_context_handle_t ctx = nullptr;
+    ur_context_native_properties_t props{
+        UR_STRUCTURE_TYPE_CONTEXT_NATIVE_PROPERTIES, nullptr, true};
+    UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urContextCreateWithNativeHandle(
+        native_context, 1, &device, &props, &ctx));
+    ASSERT_NE(ctx, nullptr);
+
+    uint32_t ref_count = 0;
+    ASSERT_SUCCESS(urContextGetInfo(ctx, UR_CONTEXT_INFO_REFERENCE_COUNT,
+                                    sizeof(uint32_t), &ref_count, nullptr));
+    ASSERT_EQ(ref_count, 1);
+}
+
+TEST_P(urContextCreateWithNativeHandleTest, SuccessWithUnOwnedNativeHandle) {
+    ur_native_handle_t native_context = nullptr;
+    {
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+            urContextGetNativeHandle(context, &native_context));
+    }
+
+    ur_context_handle_t ctx = nullptr;
+    ur_context_native_properties_t props{
+        UR_STRUCTURE_TYPE_CONTEXT_NATIVE_PROPERTIES, nullptr, false};
+    UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urContextCreateWithNativeHandle(
+        native_context, 1, &device, &props, &ctx));
+    ASSERT_NE(ctx, nullptr);
+
+    uint32_t ref_count = 0;
+    ASSERT_SUCCESS(urContextGetInfo(ctx, UR_CONTEXT_INFO_REFERENCE_COUNT,
+                                    sizeof(uint32_t), &ref_count, nullptr));
+    ASSERT_EQ(ref_count, 2);
+
+    ASSERT_SUCCESS(urContextRelease(ctx));
+}
+
+TEST_P(urContextCreateWithNativeHandleTest, InvalidNullPointerDevices) {
+    ur_native_handle_t native_context = nullptr;
+    ASSERT_SUCCESS(urContextGetNativeHandle(context, &native_context));
+
+    ur_context_handle_t ctx = nullptr;
+    ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
+                     urContextCreateWithNativeHandle(native_context, 1, nullptr,
+                                                     nullptr, &ctx));
+}
+
+TEST_P(urContextCreateWithNativeHandleTest, InvalidNullPointerContext) {
+    ur_native_handle_t native_context = nullptr;
+    ASSERT_SUCCESS(urContextGetNativeHandle(context, &native_context));
+
+    ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
+                     urContextCreateWithNativeHandle(native_context, 1, &device,
+                                                     nullptr, nullptr));
+}
diff --git a/test/conformance/device/device_adapter_cuda.match b/test/conformance/device/device_adapter_cuda.match
@@ -1 +1,2 @@
+urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
diff --git a/test/conformance/device/device_adapter_hip.match b/test/conformance/device/device_adapter_hip.match
@@ -1,2 +1,4 @@
 {{OPT}}urDeviceCreateWithNativeHandleTest.Success
+{{OPT}}urDeviceCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle
+{{OPT}}urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
diff --git a/test/conformance/device/device_adapter_level_zero.match b/test/conformance/device/device_adapter_level_zero.match
@@ -1,3 +1,4 @@
+urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle
 urDeviceGetInfoTest.Success/UR_DEVICE_INFO_GLOBAL_MEM_FREE
 urDeviceGetInfoTest.Success/UR_DEVICE_INFO_ERROR_CORRECTION_SUPPORT
 urDeviceGetInfoTest.Success/UR_DEVICE_INFO_HOST_UNIFIED_MEMORY
diff --git a/test/conformance/device/device_adapter_native_cpu.match b/test/conformance/device/device_adapter_native_cpu.match
@@ -1,3 +1,5 @@
+urDeviceCreateWithNativeHandleTest.InvalidNullHandlePlatform
+urDeviceCreateWithNativeHandleTest.InvalidNullPointerDevice
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
 {{OPT}}urDeviceSelectBinaryTest.Success
 urDeviceGetInfoTest.Success/UR_DEVICE_INFO_DEVICE_ID
diff --git a/test/conformance/device/device_adapter_opencl.match b/test/conformance/device/device_adapter_opencl.match
@@ -0,0 +1 @@
+urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle
diff --git a/test/conformance/device/urDeviceCreateWithNativeHandle.cpp b/test/conformance/device/urDeviceCreateWithNativeHandle.cpp
@@ -9,21 +9,91 @@ using urDeviceCreateWithNativeHandleTest = uur::urAllDevicesTest;
 TEST_F(urDeviceCreateWithNativeHandleTest, Success) {
     for (auto device : devices) {
         ur_native_handle_t native_handle = nullptr;
-        if (urDeviceGetNativeHandle(device, &native_handle)) {
-            continue;
+        {
+            UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+                urDeviceGetNativeHandle(device, &native_handle));
         }
 
         // We cannot assume anything about a native_handle, not even if it's
         // `nullptr` since this could be a valid representation within a backend.
         // We can however convert the native_handle back into a unified-runtime handle
         // and perform some query on it to verify that it works.
         ur_device_handle_t dev = nullptr;
-        ASSERT_SUCCESS(urDeviceCreateWithNativeHandle(native_handle, platform,
-                                                      nullptr, &dev));
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urDeviceCreateWithNativeHandle(
+            native_handle, platform, nullptr, &dev));
         ASSERT_NE(dev, nullptr);
 
         uint32_t dev_id = 0;
         ASSERT_SUCCESS(urDeviceGetInfo(dev, UR_DEVICE_INFO_TYPE,
                                        sizeof(uint32_t), &dev_id, nullptr));
     }
 }
+
+TEST_F(urDeviceCreateWithNativeHandleTest, SuccessWithOwnedNativeHandle) {
+    for (auto device : devices) {
+        ur_native_handle_t native_handle = nullptr;
+        {
+            UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+                urDeviceGetNativeHandle(device, &native_handle));
+        }
+
+        ur_device_handle_t dev = nullptr;
+        ur_device_native_properties_t props{
+            UR_STRUCTURE_TYPE_DEVICE_NATIVE_PROPERTIES, nullptr, true};
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urDeviceCreateWithNativeHandle(
+            native_handle, platform, &props, &dev));
+        ASSERT_NE(dev, nullptr);
+
+        uint32_t ref_count = 0;
+        ASSERT_SUCCESS(urDeviceGetInfo(dev, UR_DEVICE_INFO_REFERENCE_COUNT,
+                                       sizeof(uint32_t), &ref_count, nullptr));
+
+        ASSERT_EQ(ref_count, 1);
+    }
+}
+
+TEST_F(urDeviceCreateWithNativeHandleTest, SuccessWithUnOwnedNativeHandle) {
+    for (auto device : devices) {
+        ur_native_handle_t native_handle = nullptr;
+        {
+            UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+                urDeviceGetNativeHandle(device, &native_handle));
+        }
+
+        ur_device_handle_t dev = nullptr;
+        ur_device_native_properties_t props{
+            UR_STRUCTURE_TYPE_DEVICE_NATIVE_PROPERTIES, nullptr, false};
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urDeviceCreateWithNativeHandle(
+            native_handle, platform, &props, &dev));
+        ASSERT_NE(dev, nullptr);
+
+        uint32_t ref_count = 0;
+        ASSERT_SUCCESS(urDeviceGetInfo(dev, UR_DEVICE_INFO_REFERENCE_COUNT,
+                                       sizeof(uint32_t), &ref_count, nullptr));
+
+        ASSERT_EQ(ref_count, 2);
+    }
+}
+
+TEST_F(urDeviceCreateWithNativeHandleTest, InvalidNullHandlePlatform) {
+    for (auto device : devices) {
+        ur_native_handle_t native_handle = nullptr;
+        ASSERT_SUCCESS(urDeviceGetNativeHandle(device, &native_handle));
+
+        ur_device_handle_t dev = nullptr;
+        ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
+                         urDeviceCreateWithNativeHandle(native_handle, nullptr,
+                                                        nullptr, &dev));
+    }
+}
+
+TEST_F(urDeviceCreateWithNativeHandleTest, InvalidNullPointerDevice) {
+    for (auto device : devices) {
+        ur_native_handle_t native_handle = nullptr;
+        ASSERT_SUCCESS(urDeviceGetNativeHandle(device, &native_handle));
+
+        ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
+                         urDeviceCreateWithNativeHandle(native_handle, platform,
+                                                        nullptr, nullptr));
+    }
+}
diff --git a/test/conformance/device/urDevicePartition.cpp b/test/conformance/device/urDevicePartition.cpp
@@ -244,6 +244,21 @@ TEST_F(urDevicePartitionTest, InvalidNullPointerProperties) {
     }
 }
 
+TEST_F(urDevicePartitionTest, InvalidNullPointerPropertiesArray) {
+    ur_device_partition_properties_t properties{
+        UR_STRUCTURE_TYPE_DEVICE_PARTITION_PROPERTIES,
+        nullptr,
+        nullptr,
+        0,
+    };
+    for (auto device : devices) {
+        ur_device_handle_t sub_device = nullptr;
+        ASSERT_EQ_RESULT(
+            UR_RESULT_ERROR_INVALID_NULL_POINTER,
+            urDevicePartition(device, &properties, 1, &sub_device, nullptr));
+    }
+}
+
 TEST_F(urDevicePartitionTest, SuccessSubSet) {
     for (auto device : devices) {
 
diff --git a/test/conformance/event/event_adapter_native_cpu.match b/test/conformance/event/event_adapter_native_cpu.match
@@ -21,6 +21,7 @@ urEventRetainTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urEventReleaseTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urEventGetNativeHandleTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urEventGetNativeHandleTest.InvalidNullPointerNativeEvent/SYCL_NATIVE_CPU___SYCL_Native_CPU_
+urEventCreateWithNativeHandleTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urEventSetCallbackTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urEventSetCallbackTest.ValidateParameters/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urEventSetCallbackTest.AllStates/SYCL_NATIVE_CPU___SYCL_Native_CPU_
diff --git a/test/conformance/event/urEventCreateWithNativeHandle.cpp b/test/conformance/event/urEventCreateWithNativeHandle.cpp
@@ -11,17 +11,18 @@ UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urEventCreateWithNativeHandleTest);
 
 TEST_P(urEventCreateWithNativeHandleTest, Success) {
     ur_native_handle_t native_event = nullptr;
-    if (urEventGetNativeHandle(event, &native_event)) {
-        GTEST_SKIP();
+    {
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+            urEventGetNativeHandle(event, &native_event));
     }
 
     // We cannot assume anything about a native_handle, not even if it's
     // `nullptr` since this could be a valid representation within a backend.
     // We can however convert the native_handle back into a unified-runtime handle
     // and perform some query on it to verify that it works.
     uur::raii::Event evt = nullptr;
-    ASSERT_SUCCESS(urEventCreateWithNativeHandle(native_event, context, nullptr,
-                                                 evt.ptr()));
+    UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urEventCreateWithNativeHandle(
+        native_event, context, nullptr, evt.ptr()));
     ASSERT_NE(evt, nullptr);
 
     ur_execution_info_t exec_info;
diff --git a/test/conformance/kernel/kernel_adapter_hip.match b/test/conformance/kernel/kernel_adapter_hip.match
@@ -1,3 +1,7 @@
+{{OPT}}urKernelCreateWithNativeHandleTest.Success/AMD_HIP_BACKEND___{{.*}}_
+{{OPT}}urKernelCreateWithNativeHandleTest.InvalidNullHandleContext/AMD_HIP_BACKEND___{{.*}}_
+{{OPT}}urKernelCreateWithNativeHandleTest.InvalidNullHandleProgram/AMD_HIP_BACKEND___{{.*}}_
+{{OPT}}urKernelCreateWithNativeHandleTest.InvalidNullPointerNativeKernel/AMD_HIP_BACKEND___{{.*}}_
 {{OPT}}urKernelGetInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_KERNEL_INFO_NUM_REGS
 {{OPT}}urKernelGetInfoTest.InvalidSizeSmall/AMD_HIP_BACKEND___{{.*}}___UR_KERNEL_INFO_FUNCTION_NAME
 {{OPT}}urKernelGetInfoTest.InvalidSizeSmall/AMD_HIP_BACKEND___{{.*}}___UR_KERNEL_INFO_NUM_ARGS
diff --git a/test/conformance/kernel/urKernelCreateWithNativeHandle.cpp b/test/conformance/kernel/urKernelCreateWithNativeHandle.cpp
@@ -8,8 +8,9 @@
 struct urKernelCreateWithNativeHandleTest : uur::urKernelTest {
     void SetUp() override {
         UUR_RETURN_ON_FATAL_FAILURE(urKernelTest::SetUp());
-        if (urKernelGetNativeHandle(kernel, &native_kernel_handle)) {
-            GTEST_SKIP();
+        {
+            UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+                urKernelGetNativeHandle(kernel, &native_kernel_handle));
         }
     }
 
@@ -31,7 +32,7 @@ struct urKernelCreateWithNativeHandleTest : uur::urKernelTest {
 UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelCreateWithNativeHandleTest);
 
 TEST_P(urKernelCreateWithNativeHandleTest, Success) {
-    ASSERT_SUCCESS(urKernelCreateWithNativeHandle(
+    UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urKernelCreateWithNativeHandle(
         native_kernel_handle, context, program, &properties, &native_kernel));
 
     uint32_t ref_count = 0;
diff --git a/test/conformance/memory/memory_adapter_cuda.match b/test/conformance/memory/memory_adapter_cuda.match
@@ -1,2 +1 @@
-urMemBufferCreateWithNativeHandleTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
 urMemImageCreateTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}_
diff --git a/test/conformance/memory/memory_adapter_native_cpu.match b/test/conformance/memory/memory_adapter_native_cpu.match
@@ -11,5 +11,7 @@ urMemImageCreateTest.InvalidImageDescNumMipLevel/SYCL_NATIVE_CPU___SYCL_Native_C
 urMemImageCreateTest.InvalidImageDescNumSamples/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urMemImageCreateTest.InvalidImageDescRowPitch/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urMemImageCreateTest.InvalidImageDescSlicePitch/SYCL_NATIVE_CPU___SYCL_Native_CPU_
+urMemImageCreateWithHostPtrFlagsTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_MEM_FLAG_ALLOC_COPY_HOST_POINTER
+urMemImageCreateWithHostPtrFlagsTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_MEM_FLAG_USE_HOST_POINTER
 urMemReleaseTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urMemRetainTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
diff --git a/test/conformance/memory/urMemBufferCreateWithNativeHandle.cpp b/test/conformance/memory/urMemBufferCreateWithNativeHandle.cpp
@@ -10,8 +10,9 @@ UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urMemBufferCreateWithNativeHandleTest);
 
 TEST_P(urMemBufferCreateWithNativeHandleTest, Success) {
     ur_native_handle_t hNativeMem = nullptr;
-    if (urMemGetNativeHandle(buffer, device, &hNativeMem)) {
-        GTEST_SKIP();
+    {
+        UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
+            urMemGetNativeHandle(buffer, device, &hNativeMem));
     }
 
     // We cannot assume anything about a native_handle, not even if it's
@@ -24,7 +25,7 @@ TEST_P(urMemBufferCreateWithNativeHandleTest, Success) {
         /*.pNext =*/nullptr,
         /*.isNativeHandleOwned =*/false,
     };
-    ASSERT_SUCCESS(
+    UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(
         urMemBufferCreateWithNativeHandle(hNativeMem, context, &props, &mem));
     ASSERT_NE(mem, nullptr);
 
diff --git a/test/conformance/memory/urMemImageCreate.cpp b/test/conformance/memory/urMemImageCreate.cpp
@@ -3,6 +3,7 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #include <uur/fixtures.h>
+#include <uur/raii.h>
 
 using urMemImageCreateTest = uur::urContextTest;
 UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urMemImageCreateTest);
@@ -64,6 +65,13 @@ TEST_P(urMemImageCreateTest, InvalidNullPointerImageDesc) {
                                       &image_handle));
 }
 
+TEST_P(urMemImageCreateTest, InvalidNullPointerImageFormat) {
+    ur_mem_handle_t image_handle = nullptr;
+    ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
+                     urMemImageCreate(context, UR_MEM_FLAG_READ_WRITE, nullptr,
+                                      &image_desc, nullptr, &image_handle));
+}
+
 TEST_P(urMemImageCreateTest, InvalidSize) {
 
     ur_mem_handle_t image_handle = nullptr;
@@ -171,6 +179,20 @@ UUR_TEST_SUITE_P(urMemImageCreateWithHostPtrFlagsTest,
                                    UR_MEM_FLAG_USE_HOST_POINTER),
                  uur::deviceTestWithParamPrinter<ur_mem_flag_t>);
 
+TEST_P(urMemImageCreateWithHostPtrFlagsTest, Success) {
+    uur::raii::Mem host_ptr_buffer = nullptr;
+    ASSERT_SUCCESS(urMemImageCreate(context, UR_MEM_FLAG_ALLOC_HOST_POINTER,
+                                    &image_format, &image_desc, nullptr,
+                                    host_ptr_buffer.ptr()));
+
+    ur_mem_handle_t image_handle = nullptr;
+    ASSERT_SUCCESS(urMemImageCreate(context, getParam(), &image_format,
+                                    &image_desc, host_ptr_buffer.ptr(),
+                                    &image_handle));
+    ASSERT_NE(nullptr, image_handle);
+    ASSERT_SUCCESS(urMemRelease(image_handle));
+}
+
 TEST_P(urMemImageCreateWithHostPtrFlagsTest, InvalidHostPtr) {
     ur_mem_handle_t image_handle = nullptr;
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_HOST_PTR,
diff --git a/test/conformance/platform/platform_adapter_cuda.match b/test/conformance/platform/platform_adapter_cuda.match
@@ -0,0 +1 @@
+urPlatformCreateWithNativeHandleTest.InvalidNullPointerPlatform
diff --git a/test/conformance/platform/platform_adapter_hip.match b/test/conformance/platform/platform_adapter_hip.match
@@ -0,0 +1 @@
+urPlatformCreateWithNativeHandleTest.InvalidNullPointerPlatform
diff --git a/test/conformance/platform/platform_adapter_native_cpu.match b/test/conformance/platform/platform_adapter_native_cpu.match
@@ -1,3 +1,4 @@
+urPlatformCreateWithNativeHandleTest.InvalidNullPointerPlatform
 urPlatfromGetBackendOptionTest.InvalidValueFrontendOption
 urPlatfromGetBackendOptionTestWithParam.Success/_O0
 urPlatfromGetBackendOptionTestWithParam.Success/_O1
diff --git a/test/conformance/platform/urPlatformCreateWithNativeHandle.cpp b/test/conformance/platform/urPlatformCreateWithNativeHandle.cpp
diff --git a/test/conformance/platform/urPlatformGet.cpp b/test/conformance/platform/urPlatformGet.cpp
diff --git a/test/conformance/program/program_adapter_hip.match b/test/conformance/program/program_adapter_hip.match
diff --git a/test/conformance/program/urProgramCreateWithNativeHandle.cpp b/test/conformance/program/urProgramCreateWithNativeHandle.cpp
diff --git a/test/conformance/queue/urQueueCreateWithNativeHandle.cpp b/test/conformance/queue/urQueueCreateWithNativeHandle.cpp
diff --git a/test/conformance/sampler/urSamplerCreateWithNativeHandle.cpp b/test/conformance/sampler/urSamplerCreateWithNativeHandle.cpp

Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`-urContextCreateWithNativeHandleTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+urContextCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_`
`1`	`2`	`urContextSetExtendedDeleterTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+urContextCreateWithNativeHandleTest.InvalidNullPointerDevices/SYCL_NATIVE_CPU___SYCL_Native_CPU_`
	`2`	`+urContextCreateWithNativeHandleTest.InvalidNullPointerContext/SYCL_NATIVE_CPU___SYCL_Native_CPU_`
`1`	`3`	`urContextSetExtendedDeleterTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle`
`1`	`2`	`{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle`
`1`	`2`	`urDeviceGetInfoTest.Success/UR_DEVICE_INFO_GLOBAL_MEM_FREE`
`2`	`3`	`urDeviceGetInfoTest.Success/UR_DEVICE_INFO_ERROR_CORRECTION_SUPPORT`
`3`	`4`	`urDeviceGetInfoTest.Success/UR_DEVICE_INFO_HOST_UNIFIED_MEMORY`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+urDeviceCreateWithNativeHandleTest.InvalidNullHandlePlatform`
	`2`	`+urDeviceCreateWithNativeHandleTest.InvalidNullPointerDevice`
`1`	`3`	`{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime`
`2`	`4`	`{{OPT}}urDeviceSelectBinaryTest.Success`
`3`	`5`	`urDeviceGetInfoTest.Success/UR_DEVICE_INFO_DEVICE_ID`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle`