Changeset 9eb1ff5 in mainline for uspace/lib/pcut/src/run.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/run.c (modified) (14 diffs)

uspace/lib/pcut/src/run.c

@@ -73 +73 @@
 static int default_suite_initialized = 0;
 
-static void init_default_suite_when_needed(void)
-{
-        if (default_suite_initialized)
+static void init_default_suite_when_needed() {
+        if (default_suite_initialized) {
                 return;
-        
+        }
         default_suite.id = -1;
         default_suite.kind = PCUT_KIND_TESTSUITE;
@@ -92 +91 @@
  * @return Always a valid test suite item.
  */
-static pcut_item_t *pcut_find_parent_suite(pcut_item_t *it)
-{
+static pcut_item_t *pcut_find_parent_suite(pcut_item_t *it) {
         while (it != NULL) {
-                if (it->kind == PCUT_KIND_TESTSUITE)
+                if (it->kind == PCUT_KIND_TESTSUITE) {
                         return it;
-                
+                }
                 it = it->previous;
         }
-        
         init_default_suite_when_needed();
         return &default_suite;
@@ -109 +106 @@
  * @param func Function to run (can be NULL).
  */
-static void run_setup_teardown(pcut_setup_func_t func)
-{
-        if (func != NULL)
+static void run_setup_teardown(pcut_setup_func_t func) {
+        if (func != NULL) {
                 func();
+        }
 }
 
@@ -122 +119 @@
  * @param outcome Outcome of the current test.
  */
-static void leave_test(int outcome)
-{
+static void leave_test(int outcome) {
         PCUT_DEBUG("leave_test(outcome=%d), will_exit=%s", outcome,
-            leave_means_exit ? "yes" : "no");
-        if (leave_means_exit)
+                leave_means_exit ? "yes" : "no");
+        if (leave_means_exit) {
                 exit(outcome);
-        
+        }
+
 #ifndef PCUT_NO_LONG_JUMP
         longjmp(start_test_jump, 1);
@@ -141 +138 @@
  * @param message Message describing the failure.
  */
-void pcut_failed_assertion(const char *message)
-{
+void pcut_failed_assertion(const char *message) {
         static const char *prev_message = NULL;
-        
         /*
          * The assertion failed. We need to abort the current test,
@@ -150 +145 @@
          * include running the tear-down routine.
          */
-        if (print_test_error)
+        if (print_test_error) {
                 pcut_print_fail_message(message);
-        
+        }
+
         if (execute_teardown_on_failure) {
                 execute_teardown_on_failure = 0;
                 prev_message = message;
                 run_setup_teardown(current_suite->teardown_func);
-                
+
                 /* Tear-down was okay. */
                 if (report_test_result) {
-                        pcut_report_test_done(current_test, TEST_OUTCOME_FAIL,
+                        pcut_report_test_done(current_test, PCUT_OUTCOME_FAIL,
                                 message, NULL, NULL);
                 }
         } else {
                 if (report_test_result) {
-                        pcut_report_test_done(current_test, TEST_OUTCOME_FAIL,
+                        pcut_report_test_done(current_test, PCUT_OUTCOME_FAIL,
                                 prev_message, message, NULL);
                 }
         }
-        
+
         prev_message = NULL;
-        
-        leave_test(TEST_OUTCOME_FAIL); /* No return. */
+
+        leave_test(PCUT_OUTCOME_FAIL); /* No return. */
 }
 
@@ -180 +176 @@
  * @return Error status (zero means success).
  */
-static int run_test(pcut_item_t *test)
-{
+static int run_test(pcut_item_t *test) {
         /*
          * Set here as the returning point in case of test failure.
@@ -187 +182 @@
          * test execution.
          */
-        
 #ifndef PCUT_NO_LONG_JUMP
         int test_finished = setjmp(start_test_jump);
-        if (test_finished)
-                return 1;
+        if (test_finished) {
+                return PCUT_OUTCOME_FAIL;
+        }
 #endif
-        
-        if (report_test_result)
+
+        if (report_test_result) {
                 pcut_report_test_start(test);
-        
+        }
+
         current_suite = pcut_find_parent_suite(test);
         current_test = test;
-        
+
         pcut_hook_before_test(test);
-        
+
         /*
          * If anything goes wrong, execute the tear-down function
@@ -207 +203 @@
          */
         execute_teardown_on_failure = 1;
-        
+
         /*
          * Run the set-up function.
          */
         run_setup_teardown(current_suite->setup_func);
-        
+
         /*
          * The setup function was performed, it is time to run
@@ -218 +214 @@
          */
         test->test_func();
-        
+
         /*
          * Finally, run the tear-down function. We need to clear
@@ -225 +221 @@
         execute_teardown_on_failure = 0;
         run_setup_teardown(current_suite->teardown_func);
-        
+
         /*
          * If we got here, it means everything went well with
          * this test.
          */
-        if (report_test_result)
-                pcut_report_test_done(current_test, TEST_OUTCOME_PASS,
-                    NULL, NULL, NULL);
-        
-        return 0;
+        if (report_test_result) {
+                pcut_report_test_done(current_test, PCUT_OUTCOME_PASS,
+                        NULL, NULL, NULL);
+        }
+
+        return PCUT_OUTCOME_PASS;
 }
 
@@ -245 +242 @@
  * @return Error status (zero means success).
  */
-int pcut_run_test_forked(pcut_item_t *test)
-{
+int pcut_run_test_forked(pcut_item_t *test) {
+        int rc;
+
         report_test_result = 0;
         print_test_error = 1;
         leave_means_exit = 1;
-        
-        int rc = run_test(test);
-        
+
+        rc = run_test(test);
+
         current_test = NULL;
         current_suite = NULL;
-        
+
         return rc;
 }
@@ -267 +265 @@
  * @return Error status (zero means success).
  */
-int pcut_run_test_single(pcut_item_t *test)
-{
+int pcut_run_test_single(pcut_item_t *test) {
+        int rc;
+
         report_test_result = 1;
         print_test_error = 0;
         leave_means_exit = 0;
-        
-        int rc = run_test(test);
-        
+
+        rc = run_test(test);
+
         current_test = NULL;
         current_suite = NULL;
-        
+
         return rc;
 }
@@ -286 +285 @@
  * @return Timeout in seconds.
  */
-int pcut_get_test_timeout(pcut_item_t *test)
-{
+int pcut_get_test_timeout(pcut_item_t *test) {
         int timeout = PCUT_DEFAULT_TEST_TIMEOUT;
         pcut_extra_t *extras = test->extras;
-        
+
+
         while (extras->type != PCUT_EXTRA_LAST) {
-                if (extras->type == PCUT_EXTRA_TIMEOUT)
+                if (extras->type == PCUT_EXTRA_TIMEOUT) {
                         timeout = extras->timeout;
-                
+                }
                 extras++;
         }
-        
+
         return timeout;
 }