Changeset 9b20126 in mainline for uspace/lib/pcut/src/run.c

Timestamp:

2014-09-19T08:23:01Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c85a57f

Parents:

15d0046

Message:

Update PCUT to newest version

File:

• uspace/lib/pcut/src/run.c (modified) (11 diffs)

uspace/lib/pcut/src/run.c

@@ -70 +70 @@
 
 /** A NULL-like suite. */
-static pcut_item_t default_suite = {
-        .kind = PCUT_KIND_TESTSUITE,
-        .id = -1,
-        .previous = NULL,
-        .next = NULL,
-        .suite = {
-                .name = "Default",
-                .setup = NULL,
-                .teardown = NULL
-        }
-};
+static pcut_item_t default_suite;
+static int default_suite_initialized = 0;
+
+static void init_default_suite_when_needed() {
+        if (default_suite_initialized) {
+                return;
+        }
+        default_suite.id = -1;
+        default_suite.kind = PCUT_KIND_TESTSUITE;
+        default_suite.previous = NULL;
+        default_suite.next = NULL;
+        default_suite.name = "Default";
+        default_suite.setup_func = NULL;
+        default_suite.teardown_func = NULL;
+}
 
 /** Find the suite given test belongs to.
@@ -94 +98 @@
                 it = it->previous;
         }
+        init_default_suite_when_needed();
         return &default_suite;
 }
@@ -115 +120 @@
  */
 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) {
                 exit(outcome);
@@ -145 +152 @@
                 execute_teardown_on_failure = 0;
                 prev_message = message;
-                run_setup_teardown(current_suite->suite.teardown);
+                run_setup_teardown(current_suite->teardown_func);
 
                 /* Tear-down was okay. */
@@ -189 +196 @@
         current_test = test;
 
+        pcut_hook_before_test(test);
+
         /*
          * If anything goes wrong, execute the tear-down function
@@ -198 +207 @@
          * Run the set-up function.
          */
-        run_setup_teardown(current_suite->suite.setup);
+        run_setup_teardown(current_suite->setup_func);
 
         /*
@@ -204 +213 @@
          * the actual test.
          */
-        test->test.func();
+        test->test_func();
 
         /*
@@ -211 +220 @@
          */
         execute_teardown_on_failure = 0;
-        run_setup_teardown(current_suite->suite.teardown);
+        run_setup_teardown(current_suite->teardown_func);
 
         /*
@@ -234 +243 @@
  */
 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;
@@ -255 +266 @@
  */
 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;
@@ -273 +286 @@
  */
 int pcut_get_test_timeout(pcut_item_t *test) {
-        PCUT_UNUSED(test);
-
         int timeout = PCUT_DEFAULT_TEST_TIMEOUT;
-
-        pcut_extra_t *extras = test->test.extras;
+        pcut_extra_t *extras = test->extras;
+
+
         while (extras->type != PCUT_EXTRA_LAST) {
                 if (extras->type == PCUT_EXTRA_TIMEOUT) {