[PATCH 130/144] tests: use EXIT_SUCCESS/EXIT_FAILURE in most tests

Gbp-Pq: Name 0130-tests-use-EXIT_SUCCESS-EXIT_FAILURE-in-most-tests.patch

diff --git a/tests/kernel/image_query_funcs.c b/tests/kernel/image_query_funcs.c
index a59c7bccab9d311510d7ae9aeeb5152a7a2f8847..8299cc02e6059123785ec96105d14712baf422cf 100644 (file)
--- a/tests/kernel/image_query_funcs.c
+++ b/tests/kernel/image_query_funcs.c
@@ -139,5 +139,5 @@ int main(int argc, char **argv)
   free (imageData);
 
   printf("OK\n");
-  return 0;
+  return EXIT_SUCCESS;
 }

diff --git a/tests/kernel/kernel.c b/tests/kernel/kernel.c
index c2257e891a12792137dc4f779883bf93902e8985..3b6149eca9013d59bfcfa1f6c1790d3da777d63b 100644 (file)
--- a/tests/kernel/kernel.c
+++ b/tests/kernel/kernel.c
@@ -167,6 +167,5 @@ int main(int argc, char **argv)
     printf("OK\n");
   fflush(stdout);
   fflush(stderr);
-  return (retval ? 1 : 0);
+  return (retval ? EXIT_FAILURE : EXIT_SUCCESS);
 }
-

diff --git a/tests/kernel/sampler_address_clamp.c b/tests/kernel/sampler_address_clamp.c
index 9a688a30a0abf77e00ed58dc78412c8bb650f5ee..fed2fc95e2a5511bdc8893423820be3bec8ff370 100644 (file)
--- a/tests/kernel/sampler_address_clamp.c
+++ b/tests/kernel/sampler_address_clamp.c
@@ -182,9 +182,9 @@ error:
   if (retval) 
     {
       printf("FAIL\n");
-      return 1;
+      return EXIT_FAILURE;
     }
  
   printf("OK\n");
-  return 0;
+  return EXIT_SUCCESS;
 }

diff --git a/tests/regression/test_alignment_with_dynamic_wg.cpp b/tests/regression/test_alignment_with_dynamic_wg.cpp
index f04918457415c0c2cd5e600ea7111225ef9274be..731cfb564c727c84bd4041ad8c8921ac10050824 100644 (file)
--- a/tests/regression/test_alignment_with_dynamic_wg.cpp
+++ b/tests/regression/test_alignment_with_dynamic_wg.cpp
@@ -110,7 +110,7 @@ int main(int argc, char *argv[]) {
 
   if (argc < 4) {
     std::cout << "USAGE: $0 X Y Z\n";
-    return 1;
+    return EXIT_FAILURE;
   }
 
   std::string arg_x(argv[1]);
@@ -122,13 +122,13 @@ int main(int argc, char *argv[]) {
   unsigned z = std::stoi(argv[3]);
 
   if (!test_invocation(x, y, z, arg_x, arg_y, arg_z, queue))
-    return 1;
+    return EXIT_FAILURE;
 
   if (!test_invocation(y, z, x, arg_y, arg_z, arg_x, queue))
-    return 1;
+    return EXIT_FAILURE;
 
   if (!test_invocation(z, x, y, arg_z, arg_x, arg_y, queue))
-    return 1;
+    return EXIT_FAILURE;
 
-  return 0;
+  return EXIT_SUCCESS;
 }

diff --git a/tests/regression/test_alignment_with_dynamic_wg2.cpp b/tests/regression/test_alignment_with_dynamic_wg2.cpp
index 91abd9eaa3095d0ae02c7b819fb290ee3d5edf56..76d48d5a37403feef9080815ef371f140a43a354 100644 (file)
--- a/tests/regression/test_alignment_with_dynamic_wg2.cpp
+++ b/tests/regression/test_alignment_with_dynamic_wg2.cpp
@@ -82,4 +82,6 @@ int main(int argc, char *argv[]) {
   printf("Value: %le \n", out[0]);
   printf("Value: %le \n", out[1]);
   printf("Value: %le \n", out[2]);
+
+  return EXIT_SUCCESS;
 }

diff --git a/tests/regression/test_alignment_with_dynamic_wg3.cpp b/tests/regression/test_alignment_with_dynamic_wg3.cpp
index 773772d6526be570f282de3caa2d08092eaac5be..9a189f37a869820a03c9b506c05d821d98f3228d 100644 (file)
--- a/tests/regression/test_alignment_with_dynamic_wg3.cpp
+++ b/tests/regression/test_alignment_with_dynamic_wg3.cpp
@@ -55,10 +55,11 @@ int main(int argc, char *argv[]) {
 
   queue.finish();
 
-  if (out[0] == 1.0f)
+  if (out[0] == 1.0f) {
     printf("OK\n");
-  else
+    return EXIT_SUCCESS;
+  } else {
     printf("FAIL\n");
-
-  return (out[0] == 1.0f) ? 0 : 1;
+    return EXIT_FAILURE;
+  }
 }

diff --git a/tests/regression/test_assign_loop_variable_to_privvar_makes_it_local.c b/tests/regression/test_assign_loop_variable_to_privvar_makes_it_local.c
index d8e8728a10d0787cdb76544742900343785667de..5812b869eb309c7fcf5f401ae65ef710ee1dd0d1 100644 (file)
--- a/tests/regression/test_assign_loop_variable_to_privvar_makes_it_local.c
+++ b/tests/regression/test_assign_loop_variable_to_privvar_makes_it_local.c
@@ -25,6 +25,7 @@
 
 #include <CL/cl.h>
 #include "poclu.h"
+#include <stdlib.h>
 #include <string.h>
 
 const char* kernel_src = 
@@ -83,5 +84,10 @@ int main() {
     
     clFinish(command_queue);
     ret |= clReleaseKernel(kernel);
-    return ret;
+
+    if (ret == 0)
+      {
+        return EXIT_SUCCESS;
+      }
+    return EXIT_FAILURE;
 }

diff --git a/tests/regression/test_flatten_barrier_subs.cpp b/tests/regression/test_flatten_barrier_subs.cpp
index 69309337f2cc516316cfd45d4c1b95a2039ff88e..f8bc7a365de6f99b4214fc65aa48c58b678f64b4 100644 (file)
--- a/tests/regression/test_flatten_barrier_subs.cpp
+++ b/tests/regression/test_flatten_barrier_subs.cpp
@@ -240,7 +240,8 @@ int main()
     {
         std::cout << "CL gave wrong results" << std::endl;
         print_vec(cl_indices);
+        return EXIT_FAILURE;
     }
 
-    return 0;
+    return EXIT_SUCCESS;
 }

diff --git a/tests/regression/test_issue_231.cpp b/tests/regression/test_issue_231.cpp
index 08a5b50fae68b86d28e21d2eb86ab16228635c7b..ee4c45e932bebbd53fb7ef6ea181e9d4b5a61ca0 100644 (file)
--- a/tests/regression/test_issue_231.cpp
+++ b/tests/regression/test_issue_231.cpp
@@ -100,4 +100,6 @@ int main(int argc, char *argv[])
 
   queue.finish();
   cl::Platform::getDefault().unloadCompiler();
+
+  return EXIT_SUCCESS;
 }

diff --git a/tests/regression/test_issue_445.cpp b/tests/regression/test_issue_445.cpp
index 359b2b429400a493eae912f57d3f16f5f3004153..e8acb8eb58c56597f7502fed49dc9de748f44aed 100644 (file)
--- a/tests/regression/test_issue_445.cpp
+++ b/tests/regression/test_issue_445.cpp
@@ -30,6 +30,7 @@ private_local_array(__global int *__restrict__ out)
 
 int main(int, char **)
 {
+  bool success = true;
   try {
     int N = 9;
 
@@ -47,9 +48,11 @@ int main(int, char **)
     cl_int *output = (cl_int*)queue.enqueueMapBuffer(
       buffer, CL_TRUE, CL_MAP_READ, 0, N*sizeof(int));
     for (int i = 0; i < N; i++) {
-      if ((int)output[i] != i + 1)
+      if ((int)output[i] != i + 1) {
         std::cout << "FAIL: " << output[i] << " should be " << i + 1
                  << std::endl;
+        success = false;
+      }
     }
     queue.enqueueUnmapMemObject(buffer, output);
     queue.finish();
@@ -57,6 +60,11 @@ int main(int, char **)
   }
   catch (cl::Error& err) {
     std::cout << "FAIL with OpenCL error = " << err.err() << std::endl;
+    return EXIT_FAILURE;
   }
-  return 0;
+
+  if (success) {
+    return EXIT_SUCCESS;
+  }
+  return EXIT_FAILURE;
 }

diff --git a/tests/regression/test_issue_553.cpp b/tests/regression/test_issue_553.cpp
index b1f638158205e8e476f67a6f3c0fa90881ec2f82..9dada2dec441af3b414c8484cadc6e1a6c3fd635 100644 (file)
--- a/tests/regression/test_issue_553.cpp
+++ b/tests/regression/test_issue_553.cpp
@@ -72,4 +72,6 @@ int main(int argc, char *argv[])
 
   queue.finish();
   cl::Platform::getDefault().unloadCompiler();
+
+  return EXIT_SUCCESS;
 }

diff --git a/tests/regression/test_issue_577.cpp b/tests/regression/test_issue_577.cpp
index 927d82e805ecb16e2d0ba21479e5bec6a3c9cbfe..cde1af3da901002e84d13fdb5063dd8cac638fd6 100644 (file)
--- a/tests/regression/test_issue_577.cpp
+++ b/tests/regression/test_issue_577.cpp
@@ -35,9 +35,9 @@ int main(int argc, char *argv[]) {
 
   if (error_count == 2) {
     std::cout << "OK\n";
-    return 0;
+    return EXIT_SUCCESS;
   } else {
     std::cout << "FAIL\n";
-    return 1;
+    return EXIT_FAILURE;
   }
 }

diff --git a/tests/regression/test_locals.cpp b/tests/regression/test_locals.cpp
index 3511e3c921968e5798ccbd0fa479296d0fb8fb1e..e4d37f07831b9a4e7c8a67461e02a6b9758cbcc0 100644 (file)
--- a/tests/regression/test_locals.cpp
+++ b/tests/regression/test_locals.cpp
@@ -137,6 +137,10 @@ main(void)
             aBuffer, (void *) res);\r
         queue.finish();\r
         platformList[0].unloadCompiler();\r
+\r
+        if (success) {\r
+            return EXIT_SUCCESS;\r
+        }\r
     }\r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -146,9 +150,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return success ? EXIT_SUCCESS : EXIT_FAILURE;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_program_from_binary_with_local_1_1_1.c b/tests/regression/test_program_from_binary_with_local_1_1_1.c
index 5313deb50eebc579414e62677d9cd01ab12e620b..33abbdd9102f158441a17f48e9b331d70349cbf6 100644 (file)
--- a/tests/regression/test_program_from_binary_with_local_1_1_1.c
+++ b/tests/regression/test_program_from_binary_with_local_1_1_1.c
@@ -132,7 +132,7 @@ int main ()
             {
               printf("Error at %u %u : %u != %u\n", k, i,
                      output_buffer[k*vec_size+i], expected);
-              return 1;
+              return EXIT_FAILURE;
             }
         }
     }
@@ -145,5 +145,6 @@ int main ()
   clReleaseContext(context);
   clReleaseDevice(device);
   clUnloadPlatformCompiler(platform);
-  return 0;
+
+  return EXIT_SUCCESS;
 }

diff --git a/tests/runtime/test_clCreateKernel.c b/tests/runtime/test_clCreateKernel.c
index 1cf38cf4b632fb39e0dc67d0a3dfe82dbd24bf5d..b046f8296f784e53225cd75ed5664319452fe02c 100644 (file)
--- a/tests/runtime/test_clCreateKernel.c
+++ b/tests/runtime/test_clCreateKernel.c
@@ -45,8 +45,5 @@ int main(int argc, char **argv)
   free ((void *)krn_src);
 
   printf("OK\n");
-
-  return 0;
+  return EXIT_SUCCESS;
 }
-
-

diff --git a/tests/runtime/test_clCreateSubDevices.c b/tests/runtime/test_clCreateSubDevices.c
index 91a4d26ca7f7189ce4a1a6ef0b565669efef583d..fa5922e8acab76cc5c15096681a0c755d90f37a6 100644 (file)
--- a/tests/runtime/test_clCreateSubDevices.c
+++ b/tests/runtime/test_clCreateSubDevices.c
@@ -405,7 +405,5 @@ int main(int argc, char **argv)
   free (dev_pt);
 
   printf ("OK\n");
-
-  return 0;
+  return EXIT_SUCCESS;
 }
-

diff --git a/tests/runtime/test_enqueue_kernel_from_binary.c b/tests/runtime/test_enqueue_kernel_from_binary.c
index 875eade9de42628c262252a7c90795394cdf3a5a..8259af973feb9e040df2259a3388d078a37c5921 100644 (file)
--- a/tests/runtime/test_enqueue_kernel_from_binary.c
+++ b/tests/runtime/test_enqueue_kernel_from_binary.c
@@ -365,20 +365,20 @@ int main(void)
     if(h_c1[i] != h_c2[i])
     {
       printf("[1] Check failed at offset %d, %i instead of %i\n", i, h_c2[i], h_c1[i]);
-      ++errors;
-      if (errors > 10) exit(1);
+      if (++errors > 10)
+        return EXIT_FAILURE;
     }
     if ((((i/128)%2) && (h_c1[i]-16 != h_c3[i])))
     {
       printf("[2] Check failed at offset %d, %i instead of %i\n", i, h_c3[i], h_c1[i]-16);
-      ++errors;
-      if (errors > 10) exit(1);
+      if (++errors > 10)
+        return EXIT_FAILURE;
     }
     if (!((i/128)%2) && (h_c1[i] != h_c3[i]))
     {
       printf("[3] Check failed at offset %d, %i instead of %i\n", i, h_c3[i], h_c1[i]);
-      ++errors;
-      if (errors > 10) exit(1);
+      if (++errors > 10)
+        return EXIT_FAILURE;
     }
   }
 
@@ -437,5 +437,7 @@ int main(void)
   free (static_wg_binary);
   free (static_wg_buf);
 
-  return 0;
+  if (errors)
+    return EXIT_FAILURE;
+  return EXIT_SUCCESS;
 }

diff --git a/tests/runtime/test_fill-buffer.c b/tests/runtime/test_fill-buffer.c
index 102b6e56f7c52cb35aae14eb191935c78bae1ada..02b75fc96289a2c11d88c3dbffa161e29d1e0fef 100644 (file)
--- a/tests/runtime/test_fill-buffer.c
+++ b/tests/runtime/test_fill-buffer.c
@@ -113,7 +113,7 @@ main (void)
                     {
                       printf ("Expected value at %d: 1, actual value: %d\n", i,
                               host_buf1[i]);
-                      exit (1);
+                      return EXIT_FAILURE;
                     }
                 }
               for (int i = buf_size - pattern_size; i < buf_size; i++)
@@ -122,7 +122,7 @@ main (void)
                     {
                       printf ("Expected value at %d: 1, actual value: %d\n", i,
                               host_buf1[i]);
-                      exit (1);
+                      return EXIT_FAILURE;
                     }
                 }
               for (int i = pattern_size * 2; i < buf_size - pattern_size;
@@ -136,7 +136,7 @@ main (void)
                           printf (
                               "Expected value at %d: %d, actual value: %d\n",
                               i + j, expected_value, host_buf1[i + j]);
-                          exit (1);
+                          return EXIT_FAILURE;
                         }
                     }
                 }

diff --git a/tests/runtime/test_kernel_cache_includes.c b/tests/runtime/test_kernel_cache_includes.c
index 246f440d046f46b37bd639e28227ac0ccf9a5d72..d164ed7bb03cfdebbea4ce45aa6be2d4e87bd2f3 100644 (file)
--- a/tests/runtime/test_kernel_cache_includes.c
+++ b/tests/runtime/test_kernel_cache_includes.c
@@ -85,5 +85,5 @@ int main(int argc, char **argv)
 
   free ((void *)krn_src);
 
-  return 0;
+  return EXIT_SUCCESS;
 }

diff --git a/tests/workgroup/run_kernel.c b/tests/workgroup/run_kernel.c
index 9281f7b5f5ef515ca5da4f177332ee3be5431c35..f8d4b95c29172835f40ff5b1812fb3f2f4fbcc64 100644 (file)
--- a/tests/workgroup/run_kernel.c
+++ b/tests/workgroup/run_kernel.c
@@ -150,5 +150,9 @@ ERROR:
   if (context)
     clReleaseContext (context);
 
-  return (err == CL_SUCCESS) ? 0 : 1;
+  if (err == CL_SUCCESS)
+    {
+      return EXIT_SUCCESS;
+    }
+  return EXIT_FAILURE;
 }