[PATCH 131/144] tests: simplify EXIT_SUCCESS/EXIT_FAILURE usage

Gbp-Pq: Name 0131-tests-simplify-EXIT_SUCCESS-EXIT_FAILURE-usage.patch

diff --git a/tests/regression/test_barrier_before_return.cpp b/tests/regression/test_barrier_before_return.cpp
index c44c29095b89923568e020415acbf978d9f5b769..433048c12c30d18ed7cb4ea6730128149beb77c0 100644 (file)
--- a/tests/regression/test_barrier_before_return.cpp
+++ b/tests/regression/test_barrier_before_return.cpp
@@ -146,9 +146,7 @@ main(void)
         platformList[0].unloadCompiler();\r
 \r
         if (ok)\r
-          return EXIT_SUCCESS;\r
-        else\r
-          return EXIT_FAILURE;\r
+            return EXIT_SUCCESS;\r
     }\r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -158,9 +156,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_barrier_between_for_loops.cpp b/tests/regression/test_barrier_between_for_loops.cpp
index 74fdbf49a402d34f1f21e7171029e68f2bbabc9f..b79c9c7610997d8a6d2677ccf7665dee7c98892a 100644 (file)
--- a/tests/regression/test_barrier_between_for_loops.cpp
+++ b/tests/regression/test_barrier_between_for_loops.cpp
@@ -185,8 +185,6 @@ main(void)
 \r
         if (ok)\r
             return EXIT_SUCCESS;\r
-        else\r
-            return EXIT_FAILURE;\r
     }\r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -196,9 +194,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_constant_array.cpp b/tests/regression/test_constant_array.cpp
index 3ab7442c704d0ea574d0168d0473b404e430cd78..d9ebdd42ed8152230ee866c4a34fca99e19b7233 100644 (file)
--- a/tests/regression/test_constant_array.cpp
+++ b/tests/regression/test_constant_array.cpp
@@ -134,9 +134,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_early_return.cpp b/tests/regression/test_early_return.cpp
index b2c421c22c94f2b0c22ecb87f4ce11d49b4ce624..06e17d0a87d14c50675a7f7fbc3358bf95b325d2 100644 (file)
--- a/tests/regression/test_early_return.cpp
+++ b/tests/regression/test_early_return.cpp
@@ -143,8 +143,6 @@ main(void)
 \r
         if (ok)\r
             return EXIT_SUCCESS;\r
-        else\r
-            return EXIT_FAILURE;\r
     }\r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -154,9 +152,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_for_with_var_iteration_count.cpp b/tests/regression/test_for_with_var_iteration_count.cpp
index bd7ee50266daebed347ca8f33e6fe07f201e39fb..cb599864e1578f3481a8bb682a61a30aa78b636f 100644 (file)
--- a/tests/regression/test_for_with_var_iteration_count.cpp
+++ b/tests/regression/test_for_with_var_iteration_count.cpp
@@ -151,9 +151,7 @@ main(void)
         platformList[0].unloadCompiler();\r
 \r
         if (ok)\r
-          return EXIT_SUCCESS;\r
-        else\r
-          return EXIT_FAILURE;\r
+           return EXIT_SUCCESS;\r
     }\r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -163,9 +161,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_fors_with_var_iteration_counts.cpp b/tests/regression/test_fors_with_var_iteration_counts.cpp
index 27a1c3345ba493244687f80abf9d2b80f666dd07..09ab13eda467b9f62ee28b452675aa5317037d43 100644 (file)
--- a/tests/regression/test_fors_with_var_iteration_counts.cpp
+++ b/tests/regression/test_fors_with_var_iteration_counts.cpp
@@ -149,9 +149,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_id_dependent_computation.cpp b/tests/regression/test_id_dependent_computation.cpp
index eb06ab0dae6ae197c44c7718bfa624ff05ba153e..7adcab48506ab5df7b2543fb8e3851374e60619a 100644 (file)
--- a/tests/regression/test_id_dependent_computation.cpp
+++ b/tests/regression/test_id_dependent_computation.cpp
@@ -167,8 +167,6 @@ main(void)
 \r
         if (ok)\r
             return EXIT_SUCCESS;\r
-        else\r
-            return EXIT_FAILURE;\r
     }\r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -178,9 +176,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_infinite_loop.cpp b/tests/regression/test_infinite_loop.cpp
index 5edaa681510eea0ae0386b1713263930f3a17637..9ea7a4bbceba1d97f6c1c9e6cc4d6efdb95564c6 100644 (file)
--- a/tests/regression/test_infinite_loop.cpp
+++ b/tests/regression/test_infinite_loop.cpp
@@ -129,9 +129,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_loop_phi_replication.cpp b/tests/regression/test_loop_phi_replication.cpp
index 4c142f626e1c5ec18d898b281ff921df4626400f..e3d33f079513f02f485645c774406f8176c286e2 100644 (file)
--- a/tests/regression/test_loop_phi_replication.cpp
+++ b/tests/regression/test_loop_phi_replication.cpp
@@ -151,8 +151,6 @@ main(void)
 \r
         if (ok)\r
             return EXIT_SUCCESS;\r
-        else\r
-            return EXIT_FAILURE;\r
     }\r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -162,9 +160,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_multi_level_loops_with_barriers.cpp b/tests/regression/test_multi_level_loops_with_barriers.cpp
index 1414aec3a6d45a8a76bd26ed159de94a45a7b5f3..67d5543a94e90d96336d950f72d7c1ee876021ba 100644 (file)
--- a/tests/regression/test_multi_level_loops_with_barriers.cpp
+++ b/tests/regression/test_multi_level_loops_with_barriers.cpp
@@ -160,9 +160,7 @@ main(void)
         platformList[0].unloadCompiler();\r
 \r
         if (ok)\r
-          return EXIT_SUCCESS;\r
-        else\r
-          return EXIT_FAILURE;\r
+            return EXIT_SUCCESS;\r
     }\r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -172,9 +170,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_null_arg.cpp b/tests/regression/test_null_arg.cpp
index 7fd237954c43a9cd2620030dacbac58772c2f093..6e998812e5c829e9e59c3c9d86a0afd07aaf1c27 100644 (file)
--- a/tests/regression/test_null_arg.cpp
+++ b/tests/regression/test_null_arg.cpp
@@ -135,10 +135,7 @@ main(void)
         platformList[0].unloadCompiler();
 
         if (ok)
-          return EXIT_SUCCESS;
-        else
-          return EXIT_FAILURE;
-
+            return EXIT_SUCCESS;
     }
     catch (cl::Error &err) {
          std::cerr
@@ -148,9 +145,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }

diff --git a/tests/regression/test_simple_for_with_a_barrier.cpp b/tests/regression/test_simple_for_with_a_barrier.cpp
index 2af1543487f055c5d6961a4e96c69da886ef681e..29cc0693ab3a7d86f76a64ac9991e70eb6f6b45f 100644 (file)
--- a/tests/regression/test_simple_for_with_a_barrier.cpp
+++ b/tests/regression/test_simple_for_with_a_barrier.cpp
@@ -155,10 +155,7 @@ main(void)
         platformList[0].unloadCompiler();\r
 \r
         if (ok)\r
-          return EXIT_SUCCESS;\r
-        else\r
-          return EXIT_FAILURE;\r
- \r
+           return EXIT_SUCCESS;\r
     } \r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -168,9 +165,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_structs_as_args.cpp b/tests/regression/test_structs_as_args.cpp
index 51a30f12674a69ec8c7cbfbdc28452a5f262f944..da3c2549df2c839229029e8c4007d5a5e138a442 100644 (file)
--- a/tests/regression/test_structs_as_args.cpp
+++ b/tests/regression/test_structs_as_args.cpp
@@ -279,9 +279,7 @@ main(void)
         platformList[0].unloadCompiler();\r
 \r
         if (ok) \r
-          return EXIT_SUCCESS;\r
-        else\r
-          return EXIT_FAILURE;\r
+            return EXIT_SUCCESS;\r
     } \r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -291,9 +289,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_undominated_variable.cpp b/tests/regression/test_undominated_variable.cpp
index 377a0e13eac131677cabc293b6e3003510800571..29770f15b2a0127e729d0c47a47e0358de098afb 100644 (file)
--- a/tests/regression/test_undominated_variable.cpp
+++ b/tests/regression/test_undominated_variable.cpp
@@ -153,9 +153,7 @@ main(void)
         platformList[0].unloadCompiler();\r
 \r
         if (ok)\r
-          return EXIT_SUCCESS;\r
-        else\r
-          return EXIT_FAILURE;\r
+            return EXIT_SUCCESS;\r
     }\r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -165,9 +163,7 @@ main(void)
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/regression/test_vectors_as_args.cpp b/tests/regression/test_vectors_as_args.cpp
index 67c0e7b76f251979c4b0516d7c54988ac6b596a5..98771fb83f35aa4232570236d830d2b0d44f3abd 100644 (file)
--- a/tests/regression/test_vectors_as_args.cpp
+++ b/tests/regression/test_vectors_as_args.cpp
@@ -170,10 +170,7 @@ int main() {
         platformList[0].unloadCompiler();\r
 \r
         if (ok) \r
-          return EXIT_SUCCESS;\r
-        else\r
-          return EXIT_FAILURE;\r
-\r
+            return EXIT_SUCCESS;\r
     } \r
     catch (cl::Error &err) {\r
          std::cerr\r
@@ -183,9 +180,7 @@ int main() {
              << err.err()\r
              << ")"\r
              << std::endl;\r
-\r
-         return EXIT_FAILURE;\r
     }\r
 \r
-    return EXIT_SUCCESS;\r
+    return EXIT_FAILURE;\r
 }\r

diff --git a/tests/runtime/test_clCreateProgramWithBinary.c b/tests/runtime/test_clCreateProgramWithBinary.c
index 956d7dfb759f6487e1522b166f20229ebe64c735..0a5e0c8e82874ee11d7a553884532c9e83cfb01e 100644 (file)
--- a/tests/runtime/test_clCreateProgramWithBinary.c
+++ b/tests/runtime/test_clCreateProgramWithBinary.c
@@ -186,5 +186,9 @@ main(void){
 
   CHECK_CL_ERROR (clUnloadCompiler ());
 
-  return err == CL_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
+  if (err == CL_SUCCESS)
+    {
+      return EXIT_SUCCESS;
+    }
+  return EXIT_FAILURE;
 }