From: Andreas Beckmann <anbe@debian.org>
Date: Tue, 23 Nov 2021 17:17:11 +0000 (+0100)
Subject: [PATCH 131/144] tests: simplify EXIT_SUCCESS/EXIT_FAILURE usage
X-Git-Tag: archive/raspbian/1.8-3+rpi1^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fb30b1be284294c3cd11e221e60c25b3fbec6aa9;p=pocl.git

[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 c44c290..433048c 100644
--- 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();
 
         if (ok)
-          return EXIT_SUCCESS;
-        else
-          return EXIT_FAILURE;
+            return EXIT_SUCCESS;
     }
     catch (cl::Error &err) {
          std::cerr
@@ -158,9 +156,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_barrier_between_for_loops.cpp b/tests/regression/test_barrier_between_for_loops.cpp
index 74fdbf4..b79c9c7 100644
--- a/tests/regression/test_barrier_between_for_loops.cpp
+++ b/tests/regression/test_barrier_between_for_loops.cpp
@@ -185,8 +185,6 @@ main(void)
 
         if (ok)
             return EXIT_SUCCESS;
-        else
-            return EXIT_FAILURE;
     }
     catch (cl::Error &err) {
          std::cerr
@@ -196,9 +194,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_constant_array.cpp b/tests/regression/test_constant_array.cpp
index 3ab7442..d9ebdd4 100644
--- a/tests/regression/test_constant_array.cpp
+++ b/tests/regression/test_constant_array.cpp
@@ -134,9 +134,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_early_return.cpp b/tests/regression/test_early_return.cpp
index b2c421c..06e17d0 100644
--- a/tests/regression/test_early_return.cpp
+++ b/tests/regression/test_early_return.cpp
@@ -143,8 +143,6 @@ main(void)
 
         if (ok)
             return EXIT_SUCCESS;
-        else
-            return EXIT_FAILURE;
     }
     catch (cl::Error &err) {
          std::cerr
@@ -154,9 +152,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_for_with_var_iteration_count.cpp b/tests/regression/test_for_with_var_iteration_count.cpp
index bd7ee50..cb59986 100644
--- 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();
 
         if (ok)
-          return EXIT_SUCCESS;
-        else
-          return EXIT_FAILURE;
+           return EXIT_SUCCESS;
     }
     catch (cl::Error &err) {
          std::cerr
@@ -163,9 +161,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_fors_with_var_iteration_counts.cpp b/tests/regression/test_fors_with_var_iteration_counts.cpp
index 27a1c33..09ab13e 100644
--- 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()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_id_dependent_computation.cpp b/tests/regression/test_id_dependent_computation.cpp
index eb06ab0..7adcab4 100644
--- a/tests/regression/test_id_dependent_computation.cpp
+++ b/tests/regression/test_id_dependent_computation.cpp
@@ -167,8 +167,6 @@ main(void)
 
         if (ok)
             return EXIT_SUCCESS;
-        else
-            return EXIT_FAILURE;
     }
     catch (cl::Error &err) {
          std::cerr
@@ -178,9 +176,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_infinite_loop.cpp b/tests/regression/test_infinite_loop.cpp
index 5edaa68..9ea7a4b 100644
--- a/tests/regression/test_infinite_loop.cpp
+++ b/tests/regression/test_infinite_loop.cpp
@@ -129,9 +129,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_loop_phi_replication.cpp b/tests/regression/test_loop_phi_replication.cpp
index 4c142f6..e3d33f0 100644
--- a/tests/regression/test_loop_phi_replication.cpp
+++ b/tests/regression/test_loop_phi_replication.cpp
@@ -151,8 +151,6 @@ main(void)
 
         if (ok)
             return EXIT_SUCCESS;
-        else
-            return EXIT_FAILURE;
     }
     catch (cl::Error &err) {
          std::cerr
@@ -162,9 +160,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_multi_level_loops_with_barriers.cpp b/tests/regression/test_multi_level_loops_with_barriers.cpp
index 1414aec..67d5543 100644
--- 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();
 
         if (ok)
-          return EXIT_SUCCESS;
-        else
-          return EXIT_FAILURE;
+            return EXIT_SUCCESS;
     }
     catch (cl::Error &err) {
          std::cerr
@@ -172,9 +170,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_null_arg.cpp b/tests/regression/test_null_arg.cpp
index 7fd2379..6e99881 100644
--- 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 2af1543..29cc069 100644
--- 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();
 
         if (ok)
-          return EXIT_SUCCESS;
-        else
-          return EXIT_FAILURE;
- 
+           return EXIT_SUCCESS;
     } 
     catch (cl::Error &err) {
          std::cerr
@@ -168,9 +165,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_structs_as_args.cpp b/tests/regression/test_structs_as_args.cpp
index 51a30f1..da3c254 100644
--- 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();
 
         if (ok) 
-          return EXIT_SUCCESS;
-        else
-          return EXIT_FAILURE;
+            return EXIT_SUCCESS;
     } 
     catch (cl::Error &err) {
          std::cerr
@@ -291,9 +289,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_undominated_variable.cpp b/tests/regression/test_undominated_variable.cpp
index 377a0e1..29770f1 100644
--- a/tests/regression/test_undominated_variable.cpp
+++ b/tests/regression/test_undominated_variable.cpp
@@ -153,9 +153,7 @@ main(void)
         platformList[0].unloadCompiler();
 
         if (ok)
-          return EXIT_SUCCESS;
-        else
-          return EXIT_FAILURE;
+            return EXIT_SUCCESS;
     }
     catch (cl::Error &err) {
          std::cerr
@@ -165,9 +163,7 @@ main(void)
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/regression/test_vectors_as_args.cpp b/tests/regression/test_vectors_as_args.cpp
index 67c0e7b..98771fb 100644
--- 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();
 
         if (ok) 
-          return EXIT_SUCCESS;
-        else
-          return EXIT_FAILURE;
-
+            return EXIT_SUCCESS;
     } 
     catch (cl::Error &err) {
          std::cerr
@@ -183,9 +180,7 @@ int main() {
              << err.err()
              << ")"
              << std::endl;
-
-         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return EXIT_FAILURE;
 }
diff --git a/tests/runtime/test_clCreateProgramWithBinary.c b/tests/runtime/test_clCreateProgramWithBinary.c
index 956d7df..0a5e0c8 100644
--- 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;
 }