[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

diff --git a/tests/runtime/CMakeLists.txt b/tests/runtime/CMakeLists.txt
index fa43dffb2ea13bdd1a8acb13cb5e2d818b51900e..b620d85c4b5df81758232a1c5e7e6e984fa87ce0 100644 (file)
--- 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 01b5a1a761af357a433f7ce9290e138e39624b5a..9fb2080ace47eb58030aaeb4921b3664b7fb95d3 100644 (file)
--- 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 215c093cbf48ebfa315179c3f5f1a04c5c06f45b..f42e413fcfd9872393cff5fd87d3602569dd2bb2 100644 (file)
--- 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 638f0bf3d8b07fa1f0d0edca8abd33c3c464c4dc..e5171f404a52245c17ab975ee9f55334d226bcef 100644 (file)
--- 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