From 9cc8b13e8e4d912930d66d8f4a55f3029afc19c7 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Wed, 24 Nov 2021 10:29:45 +0100 Subject: [PATCH] [PATCH 135/144] skip tests that require unavailable devices do not silently let them "pass" 77 is the return code used by GNU autotest to indicate SKIP Gbp-Pq: Name 0135-skip-tests-that-require-unavailable-devices.patch --- tests/runtime/CMakeLists.txt | 12 +++++++++--- tests/runtime/test_buffer_migration.c | 2 +- tests/runtime/test_buffer_ping_pong.c | 2 +- tests/runtime/test_cl_pocl_content_size.c | 3 +-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/runtime/CMakeLists.txt b/tests/runtime/CMakeLists.txt index fa43dff..b620d85 100644 --- a/tests/runtime/CMakeLists.txt +++ b/tests/runtime/CMakeLists.txt @@ -106,13 +106,13 @@ add_test_pocl(NAME "runtime/test_enqueue_kernel_from_binary" COMMAND "test_enque add_test_pocl(NAME "runtime/test_user_event" COMMAND "test_user_event") -add_test_pocl(NAME "runtime/test_buffer_migration" COMMAND "test_buffer_migration") +add_test(NAME "runtime/test_buffer_migration" COMMAND "test_buffer_migration") -add_test_pocl(NAME "runtime/test_buffer_ping_pong" COMMAND "test_buffer_ping_pong") +add_test(NAME "runtime/test_buffer_ping_pong" COMMAND "test_buffer_ping_pong") add_test_pocl(NAME "runtime/clSetMemObjectDestructorCallback" COMMAND "test_clSetMemObjectDestructorCallback") -add_test_pocl(NAME "runtime/test_cl_pocl_content_size" COMMAND "test_cl_pocl_content_size") +add_test(NAME "runtime/test_cl_pocl_content_size" COMMAND "test_cl_pocl_content_size") set_tests_properties( "runtime/clGetDeviceInfo" "runtime/clEnqueueNativeKernel" "runtime/clGetEventInfo" "runtime/clCreateProgramWithBinary" @@ -135,6 +135,12 @@ set_tests_properties( "runtime/clGetDeviceInfo" "runtime/clEnqueueNativeKernel" DEPENDS "pocl_version_check" LABELS "internal;runtime") +set_tests_properties( + "runtime/test_buffer_migration" + "runtime/test_buffer_ping_pong" + "runtime/test_cl_pocl_content_size" + PROPERTIES SKIP_RETURN_CODE 77) + if(NOT ENABLE_ANYSAN) set_tests_properties("runtime/clCreateKernelsInProgram" PROPERTIES diff --git a/tests/runtime/test_buffer_migration.c b/tests/runtime/test_buffer_migration.c index 01b5a1a..9fb2080 100644 --- a/tests/runtime/test_buffer_migration.c +++ b/tests/runtime/test_buffer_migration.c @@ -62,7 +62,7 @@ main (int argc, char **argv) if (num_devices < 2) { printf ("NOT ENOUGH DEVICES! (need 2)\n"); - exit(0); + return 77; } const char *basename = "migration_test"; diff --git a/tests/runtime/test_buffer_ping_pong.c b/tests/runtime/test_buffer_ping_pong.c index 215c093..f42e413 100644 --- a/tests/runtime/test_buffer_ping_pong.c +++ b/tests/runtime/test_buffer_ping_pong.c @@ -107,7 +107,7 @@ main (int argc, char **argv) if (num_devices < 2) { printf ("NOT ENOUGH DEVICES! (need 2)\n"); - exit(0); + return 77; } err = clSetKernelArg (kernel_a, 0, sizeof (cl_mem), &buf); diff --git a/tests/runtime/test_cl_pocl_content_size.c b/tests/runtime/test_cl_pocl_content_size.c index 638f0bf..e5171f4 100644 --- a/tests/runtime/test_cl_pocl_content_size.c +++ b/tests/runtime/test_cl_pocl_content_size.c @@ -57,8 +57,7 @@ main (void) if (strstr (devname, "basic") == NULL && strstr (devname, "pthread") == NULL) { printf ("Device is not basic/pthread -> skipping test\n"); - printf ("OK"); - return 0; + return 77; } buf_content_src -- 2.30.2