Changeset 9eb1ff5 in mainline for uspace/lib/pcut/src/report/tap.c

Timestamp:

2017-12-08T14:47:08Z (7 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c1694b6b

Parents:

6fb8b2c

Message:

Update PCUT

Updated PCUT to commit 7ce059f.

Notable changes include:

• overall summary is printed when tests finish
• when tests passed, the status message does not use the word 'failure'
• program exit code is zero only when all tests passed

These changes fixes tickets 713 and 714.

​http://www.helenos.org/ticket/713
​http://www.helenos.org/ticket/714

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;
@@ -55 +58 @@
         int tests_total = pcut_count_tests(all_items);
         test_counter = 0;
+        failed_test_counter = 0;
 
         printf("1..%d\n", tests_total);
@@ -75 +79 @@
  */
 static void tap_suite_done(pcut_item_t *suite) {
-        printf("#> Finished suite %s (failed %d of %d).\n",
-                        suite->name, failed_tests_in_suite, tests_in_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);
+        }
 }
 
@@ -129 +138 @@
         const char *fail_error_str = NULL;
 
-        if (outcome != TEST_OUTCOME_PASS) {
+        if (outcome != PCUT_OUTCOME_PASS) {
                 failed_tests_in_suite++;
+                failed_test_counter++;
         }
 
         switch (outcome) {
-        case TEST_OUTCOME_PASS:
+        case PCUT_OUTCOME_PASS:
                 status_str = "ok";
                 fail_error_str = "";
                 break;
-        case TEST_OUTCOME_FAIL:
+        case PCUT_OUTCOME_FAIL:
                 status_str = "not ok";
                 fail_error_str = " failed";
                 break;
-        case TEST_OUTCOME_ERROR:
+        default:
                 status_str = "not ok";
                 fail_error_str = " aborted";
-                break;
-        default:
-                /* Shall not get here. */
                 break;
         }
@@ -160 +167 @@
 /** 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);
+        }
 }