From c746e7ebeba9b538c01a2c39d194fe6e5751af31 Mon Sep 17 00:00:00 2001 From: Ahmed Hesham Date: Tue, 10 Dec 2024 16:54:38 +0000 Subject: [PATCH] Skip the test instead of throwing an error If the device does not support the required extension, skip the test, instead of throwing an exception and failing. Signed-off-by: Ahmed Hesham --- .../vulkan/test_vulkan_api_consistency.cpp | 11 ++++++----- .../test_vulkan_api_consistency_for_1dimages.cpp | 6 +++--- .../test_vulkan_api_consistency_for_3dimages.cpp | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/test_conformance/vulkan/test_vulkan_api_consistency.cpp b/test_conformance/vulkan/test_vulkan_api_consistency.cpp index 0237a95089..47949bb9b6 100644 --- a/test_conformance/vulkan/test_vulkan_api_consistency.cpp +++ b/test_conformance/vulkan/test_vulkan_api_consistency.cpp @@ -68,9 +68,9 @@ int test_consistency_external_buffer(cl_device_id deviceID, cl_context _context, #else if (!is_extension_available(devList[0], "cl_khr_external_memory_opaque_fd")) { - throw std::runtime_error( - "Device does not support " - "cl_khr_external_memory_opaque_fd extension \n"); + log_info("Device does not support " + "cl_khr_external_memory_opaque_fd extension \n"); + return TEST_SKIPPED_ITSELF; } #endif @@ -220,8 +220,9 @@ int test_consistency_external_image(cl_device_id deviceID, cl_context _context, #else if (!is_extension_available(devList[0], "cl_khr_external_memory_opaque_fd")) { - test_fail("Device does not support cl_khr_external_memory_opaque_fd " - "extension \n"); + log_info("Device does not support cl_khr_external_memory_opaque_fd " + "extension \n"); + return TEST_SKIPPED_ITSELF; } #endif uint32_t width = 256; diff --git a/test_conformance/vulkan/test_vulkan_api_consistency_for_1dimages.cpp b/test_conformance/vulkan/test_vulkan_api_consistency_for_1dimages.cpp index 6e17c121fe..d3b3ac8e36 100644 --- a/test_conformance/vulkan/test_vulkan_api_consistency_for_1dimages.cpp +++ b/test_conformance/vulkan/test_vulkan_api_consistency_for_1dimages.cpp @@ -54,9 +54,9 @@ int test_consistency_external_for_1dimage(cl_device_id deviceID, #else if (!is_extension_available(devList[0], "cl_khr_external_memory_opaque_fd")) { - throw std::runtime_error( - "Device does not support cl_khr_external_memory_opaque_fd " - "extension \n"); + log_info("Device does not support cl_khr_external_memory_opaque_fd " + "extension \n"); + return TEST_SKIPPED_ITSELF; } #endif uint32_t width = 256; diff --git a/test_conformance/vulkan/test_vulkan_api_consistency_for_3dimages.cpp b/test_conformance/vulkan/test_vulkan_api_consistency_for_3dimages.cpp index efb15a8639..bf90096ef3 100644 --- a/test_conformance/vulkan/test_vulkan_api_consistency_for_3dimages.cpp +++ b/test_conformance/vulkan/test_vulkan_api_consistency_for_3dimages.cpp @@ -56,9 +56,9 @@ int test_consistency_external_for_3dimage(cl_device_id deviceID, #else if (!is_extension_available(devList[0], "cl_khr_external_memory_opaque_fd")) { - throw std::runtime_error( - "Device does not support cl_khr_external_memory_opaque_fd " - "extension \n"); + log_info("Device does not support cl_khr_external_memory_opaque_fd " + "extension \n"); + return TEST_SKIPPED_ITSELF; } #endif uint32_t width = 256;