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

Timestamp:

2014-09-19T08:23:01Z (11 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/main.c (modified) (10 diffs)

uspace/lib/pcut/src/main.c

@@ -41 +41 @@
 int pcut_run_mode = PCUT_RUN_MODE_FORKING;
 
+/** Empty list to bypass special handling for NULL. */
+static pcut_main_extra_t empty_main_extra[] = {
+        PCUT_MAIN_EXTRA_SET_LAST
+};
+
+/** Helper for iteration over main extras. */
+#define FOR_EACH_MAIN_EXTRA(extras, it) \
+        for (it = extras; it->type != PCUT_MAIN_EXTRA_LAST; it++)
 
 /** Checks whether the argument is an option followed by a number.
@@ -54 +62 @@
                 return 0;
         }
-        int val = pcut_str_to_int(arg + opt_len);
-        *value = val;
+        *value = pcut_str_to_int(arg + opt_len);
         return 1;
 }
@@ -85 +92 @@
  */
 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;
+
         pcut_item_t *it = pcut_get_real_next(suite);
         if ((it == NULL) || (it->kind == PCUT_KIND_TESTSUITE)) {
@@ -90 +100 @@
         }
 
-        int is_first_test = 1;
-        int total_count = 0;
-
         for (; it != NULL; it = pcut_get_real_next(it)) {
                 if (it->kind == PCUT_KIND_TESTSUITE) {
@@ -135 +142 @@
 static void set_setup_teardown_callbacks(pcut_item_t *first) {
         pcut_item_t *active_suite = NULL;
-        for (pcut_item_t *it = first; it != NULL; it = pcut_get_real_next(it)) {
+        pcut_item_t *it;
+        for (it = first; it != NULL; it = pcut_get_real_next(it)) {
                 if (it->kind == PCUT_KIND_TESTSUITE) {
                         active_suite = it;
                 } else if (it->kind == PCUT_KIND_SETUP) {
                         if (active_suite != NULL) {
-                                active_suite->suite.setup = it->setup.func;
+                                active_suite->setup_func = it->setup_func;
                         }
                         it->kind = PCUT_KIND_SKIP;
                 } else if (it->kind == PCUT_KIND_TEARDOWN) {
                         if (active_suite != NULL) {
-                                active_suite->suite.teardown = it->setup.func;
+                                active_suite->teardown_func = it->teardown_func;
                         }
                         it->kind = PCUT_KIND_SKIP;
@@ -166 +174 @@
 int pcut_main(pcut_item_t *last, int argc, char *argv[]) {
         pcut_item_t *items = pcut_fix_list_get_real_head(last);
+        pcut_item_t *it;
+        pcut_main_extra_t *main_extras = last->main_extras;
+        pcut_main_extra_t *main_extras_it;
 
         int run_only_suite = -1;
         int run_only_test = -1;
 
+        if (main_extras == NULL) {
+                main_extras = empty_main_extra;
+        }
+
         pcut_report_register_handler(&pcut_report_tap);
+
+        FOR_EACH_MAIN_EXTRA(main_extras, main_extras_it) {
+                if (main_extras_it->type == PCUT_MAIN_EXTRA_REPORT_XML) {
+                        pcut_report_register_handler(&pcut_report_xml);
+                }
+                if (main_extras_it->type == PCUT_MAIN_EXTRA_PREINIT_HOOK) {
+                        main_extras_it->preinit_hook(&argc, &argv);
+                }
+        }
 
         if (argc > 1) {
@@ -195 +219 @@
         set_setup_teardown_callbacks(items);
 
+        FOR_EACH_MAIN_EXTRA(main_extras, main_extras_it) {
+                if (main_extras_it->type == PCUT_MAIN_EXTRA_INIT_HOOK) {
+                        main_extras_it->init_hook();
+                }
+        }
+
         PCUT_DEBUG("run_only_suite = %d   run_only_test = %d", run_only_suite, run_only_test);
 
@@ -218 +248 @@
 
         if (run_only_test > 0) {
+                int rc;
                 pcut_item_t *test = pcut_find_by_id(items, run_only_test);
                 if (test == NULL) {
@@ -228 +259 @@
                 }
 
-                int rc;
                 if (pcut_run_mode == PCUT_RUN_MODE_SINGLE) {
                         rc = pcut_run_test_single(test);
@@ -241 +271 @@
         pcut_report_init(items);
 
-        pcut_item_t *it = items;
+        it = items;
         while (it != NULL) {
                 if (it->kind == PCUT_KIND_TESTSUITE) {