Changes in uspace/lib/pcut/src/main.c [9eb1ff5:9b20126] in mainline

File:

• uspace/lib/pcut/src/main.c (modified) (10 diffs)

uspace/lib/pcut/src/main.c

@@ -90 +90 @@
  * @param last Pointer to first item after this suite is stored here.
  * @param prog_path Path to the current binary (used in forked mode).
- * @return Error code.
- */
-static int run_suite(pcut_item_t *suite, pcut_item_t **last, const char *prog_path) {
+ */
+static void run_suite(pcut_item_t *suite, pcut_item_t **last, const char *prog_path) {
         int is_first_test = 1;
         int total_count = 0;
-        int ret_code = PCUT_OUTCOME_PASS;
-        int ret_code_tmp;
 
         pcut_item_t *it = pcut_get_real_next(suite);
@@ -117 +114 @@
 
                 if (pcut_run_mode == PCUT_RUN_MODE_FORKING) {
-                        ret_code_tmp = pcut_run_test_forking(prog_path, it);
-                } else {
-                        ret_code_tmp = pcut_run_test_single(it);
-                }
-
-                /*
-                 * Override final return code in case of failure.
-                 *
-                 * In this case we suppress any special error codes as
-                 * to the outside, there was a failure.
-                 */
-                if (ret_code_tmp != PCUT_OUTCOME_PASS) {
-                        ret_code = PCUT_OUTCOME_FAIL;
-                }
-
+                        pcut_run_test_forking(prog_path, it);
+                } else {
+                        pcut_run_test_single(it);
+                }
                 total_count++;
         }
@@ -144 +130 @@
                 *last = it;
         }
-
-        return ret_code;
 }
 
@@ -197 +181 @@
         int run_only_test = -1;
 
-        int rc, rc_tmp;
-
         if (main_extras == NULL) {
                 main_extras = empty_main_extra;
@@ -221 +203 @@
                         if (pcut_str_equals(argv[i], "-l")) {
                                 pcut_print_tests(items);
-                                return PCUT_OUTCOME_PASS;
+                                return 0;
                         }
                         if (pcut_str_equals(argv[i], "-x")) {
@@ -247 +229 @@
         if ((run_only_suite >= 0) && (run_only_test >= 0)) {
                 printf("Specify either -s or -t!\n");
-                return PCUT_OUTCOME_BAD_INVOCATION;
+                return 1;
         }
 
@@ -254 +236 @@
                 if (suite == NULL) {
                         printf("Suite not found, aborting!\n");
-                        return PCUT_OUTCOME_BAD_INVOCATION;
+                        return 2;
                 }
                 if (suite->kind != PCUT_KIND_TESTSUITE) {
                         printf("Invalid suite id!\n");
-                        return PCUT_OUTCOME_BAD_INVOCATION;
+                        return 3;
                 }
 
                 run_suite(suite, NULL, argv[0]);
-                return PCUT_OUTCOME_PASS;
+                return 0;
         }
 
         if (run_only_test > 0) {
+                int rc;
                 pcut_item_t *test = pcut_find_by_id(items, run_only_test);
                 if (test == NULL) {
                         printf("Test not found, aborting!\n");
-                        return PCUT_OUTCOME_BAD_INVOCATION;
+                        return 2;
                 }
                 if (test->kind != PCUT_KIND_TEST) {
                         printf("Invalid test id!\n");
-                        return PCUT_OUTCOME_BAD_INVOCATION;
+                        return 3;
                 }
 
@@ -287 +270 @@
         /* Otherwise, run the whole thing. */
         pcut_report_init(items);
-
-        rc = PCUT_OUTCOME_PASS;
 
         it = items;
@@ -294 +275 @@
                 if (it->kind == PCUT_KIND_TESTSUITE) {
                         pcut_item_t *tmp;
-                        rc_tmp = run_suite(it, &tmp, argv[0]);
-                        if (rc_tmp != PCUT_OUTCOME_PASS) {
-                                rc = rc_tmp;
-                        }
+                        run_suite(it, &tmp, argv[0]);
                         it = tmp;
                 } else {
@@ -306 +284 @@
         pcut_report_done();
 
-        return rc;
-}
+        return 0;
+}