Changeset 9b20126 in mainline for uspace/lib/pcut/src/report/tap.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/report/tap.c (modified) (6 diffs)

uspace/lib/pcut/src/report/tap.c

@@ -67 +67 @@
         failed_tests_in_suite = 0;
 
-        printf("#> Starting suite %s.\n", suite->suite.name);
+        printf("#> Starting suite %s.\n", suite->name);
 }
 
@@ -76 +76 @@
 static void tap_suite_done(pcut_item_t *suite) {
         printf("#> Finished suite %s (failed %d of %d).\n",
-                        suite->suite.name, failed_tests_in_suite, tests_in_suite);
+                        suite->name, failed_tests_in_suite, tests_in_suite);
 }
 
@@ -98 +98 @@
  */
 static void print_by_lines(const char *message, const char *prefix) {
+        char *next_line_start;
         if ((message == NULL) || (message[0] == 0)) {
                 return;
         }
-        char *next_line_start = pcut_str_find_char(message, '\n');
+        next_line_start = pcut_str_find_char(message, '\n');
         while (next_line_start != NULL) {
                 next_line_start[0] = 0;
@@ -124 +125 @@
                 const char *error_message, const char *teardown_error_message,
                 const char *extra_output) {
-        const char *test_name = test->test.name;
+        const char *test_name = test->name;
+        const char *status_str = NULL;
+        const char *fail_error_str = NULL;
 
         if (outcome != TEST_OUTCOME_PASS) {
@@ -130 +133 @@
         }
 
-        const char *status_str = NULL;
-        const char *fail_error_str = NULL;
         switch (outcome) {
         case TEST_OUTCOME_PASS:
@@ -158 +159 @@
 
 /** Report testing done. */
-static void tap_done() {
+static void tap_done(void) {
 }
 
 
 pcut_report_ops_t pcut_report_tap = {
-        .init = tap_init,
-        .done = tap_done,
-        .suite_start = tap_suite_start,
-        .suite_done = tap_suite_done,
-        .test_start = tap_test_start,
-        .test_done = tap_test_done
+        tap_init, tap_done,
+        tap_suite_start, tap_suite_done,
+        tap_test_start, tap_test_done
 };