Changeset 134ac5d in mainline for uspace/lib/pcut/src/list.c

Timestamp:

2014-06-06T07:54:24Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8db09e4

Parents:

eeb23f2d

Message:

Update PCUT to newest version

File:

• uspace/lib/pcut/src/list.c (modified) (3 diffs)

uspace/lib/pcut/src/list.c

@@ -35 +35 @@
 #include <stdlib.h>
 #include "internal.h"
-#include <pcut/test.h>
+#include <pcut/pcut.h>
 
 
@@ -118 +118 @@
 }
 
+/** Hide tests that are marked to be skipped.
+ *
+ * Go through all tests and those that have PCUT_EXTRA_SKIP mark
+ * as skipped with PCUT_KIND_SKIP.
+ *
+ * @param first Head of the list.
+ */
+static void detect_skipped_tests(pcut_item_t *first) {
+        assert(first != NULL);
+        if (first->kind == PCUT_KIND_SKIP) {
+                first = pcut_get_real_next(first);
+        }
+        for (pcut_item_t *it = first; it != NULL; it = pcut_get_real_next(it)) {
+                if (it->kind != PCUT_KIND_TEST) {
+                        continue;
+                }
+                pcut_extra_t *extras = it->test.extras;
+                while (extras->type != PCUT_EXTRA_LAST) {
+                        if (extras->type == PCUT_EXTRA_SKIP) {
+                                it->kind = PCUT_KIND_SKIP;
+                                break;
+                        }
+                        extras++;
+                }
+        }
+}
+
 /** Convert the static single-linked list into a flat double-linked list.
  *
@@ -143 +170 @@
         }
 
+        detect_skipped_tests(next);
+
         set_ids(next);