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

File:

• uspace/lib/pcut/src/report/tap.c (modified) (5 diffs)

uspace/lib/pcut/src/report/tap.c

@@ -42 +42 @@
 static int test_counter;
 
-/** Counter of all failures. */
-static int failed_test_counter;
-
 /** Counter for tests in a current suite. */
 static int tests_in_suite;
@@ -58 +55 @@
         int tests_total = pcut_count_tests(all_items);
         test_counter = 0;
-        failed_test_counter = 0;
 
         printf("1..%d\n", tests_total);
@@ -79 +75 @@
  */
 static void tap_suite_done(pcut_item_t *suite) {
-        if (failed_tests_in_suite == 0) {
-                printf("#> Finished suite %s (passed).\n",
-                                suite->name);
-        } else {
-                printf("#> Finished suite %s (failed %d of %d).\n",
-                                suite->name, failed_tests_in_suite, tests_in_suite);
-        }
+        printf("#> Finished suite %s (failed %d of %d).\n",
+                        suite->name, failed_tests_in_suite, tests_in_suite);
 }
 
@@ -138 +129 @@
         const char *fail_error_str = NULL;
 
-        if (outcome != PCUT_OUTCOME_PASS) {
+        if (outcome != TEST_OUTCOME_PASS) {
                 failed_tests_in_suite++;
-                failed_test_counter++;
         }
 
         switch (outcome) {
-        case PCUT_OUTCOME_PASS:
+        case TEST_OUTCOME_PASS:
                 status_str = "ok";
                 fail_error_str = "";
                 break;
-        case PCUT_OUTCOME_FAIL:
+        case TEST_OUTCOME_FAIL:
                 status_str = "not ok";
                 fail_error_str = " failed";
                 break;
-        default:
+        case TEST_OUTCOME_ERROR:
                 status_str = "not ok";
                 fail_error_str = " aborted";
+                break;
+        default:
+                /* Shall not get here. */
                 break;
         }
@@ -167 +160 @@
 /** Report testing done. */
 static void tap_done(void) {
-        if (failed_test_counter == 0) {
-                printf("#> Done: all tests passed.\n");
-        } else {
-                printf("#> Done: %d of %d tests failed.\n", failed_test_counter, test_counter);
-        }
 }