Changeset 9eb1ff5 in mainline for uspace/lib/pcut/src/os/unix.c

Timestamp:

2017-12-08T14:47:08Z (8 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/os/unix.c (modified) (9 diffs)

uspace/lib/pcut/src/os/unix.c

@@ -36 +36 @@
 /** We need _BSD_SOURCE because of snprintf() when compiling under C89. */
 #define _BSD_SOURCE
+
+/** Newer versions of features.h needs _DEFAULT_SOURCE. */
+#define _DEFAULT_SOURCE
+
 #include <stdlib.h>
 #include <unistd.h>
-#include <stddef.h>
+#include <sys/types.h>
 #include <signal.h>
 #include <errno.h>
@@ -120 +124 @@
         if (WIFEXITED(status)) {
                 if (WEXITSTATUS(status) != 0) {
-                        return TEST_OUTCOME_FAIL;
+                        return PCUT_OUTCOME_FAIL;
                 } else {
-                        return TEST_OUTCOME_PASS;
+                        return PCUT_OUTCOME_PASS;
                 }
         }
 
         if (WIFSIGNALED(status)) {
-                return TEST_OUTCOME_ERROR;
+                return PCUT_OUTCOME_INTERNAL_ERROR;
         }
 
@@ -138 +142 @@
  * @param test Test to be run.
  */
-void pcut_run_test_forking(const char *self_path, pcut_item_t *test) {
+int pcut_run_test_forking(const char *self_path, pcut_item_t *test) {
         int link_stdout[2], link_stderr[2];
-        int rc, status;
+        int rc, status, outcome;
         size_t stderr_size;
 
@@ -152 +156 @@
                 snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1,
                                 "pipe() failed: %s.", strerror(rc));
-                pcut_report_test_done(test, TEST_OUTCOME_ERROR, error_message_buffer, NULL, NULL);
-                return;
+                pcut_report_test_done(test, PCUT_OUTCOME_INTERNAL_ERROR, error_message_buffer, NULL, NULL);
+                return PCUT_OUTCOME_INTERNAL_ERROR;
         }
         rc = pipe(link_stderr);
@@ -159 +163 @@
                 snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1,
                                 "pipe() failed: %s.", strerror(rc));
-                pcut_report_test_done(test, TEST_OUTCOME_ERROR, error_message_buffer, NULL, NULL);
-                return;
+                pcut_report_test_done(test, PCUT_OUTCOME_INTERNAL_ERROR, error_message_buffer, NULL, NULL);
+                return PCUT_OUTCOME_INTERNAL_ERROR;
         }
 
@@ -167 +171 @@
                 snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1,
                         "fork() failed: %s.", strerror(rc));
-                rc = TEST_OUTCOME_ERROR;
+                outcome = PCUT_OUTCOME_INTERNAL_ERROR;
                 goto leave_close_pipes;
         }
@@ -178 +182 @@
                 close(link_stderr[0]);
 
-                rc = pcut_run_test_forked(test);
-
-                exit(rc);
+                outcome = pcut_run_test_forked(test);
+
+                exit(outcome);
         }
 
@@ -195 +199 @@
         alarm(0);
 
-        rc = convert_wait_status_to_outcome(status);
+        outcome = convert_wait_status_to_outcome(status);
 
         goto leave_close_parent_pipe;
@@ -206 +210 @@
         close(link_stderr[0]);
 
-        pcut_report_test_done_unparsed(test, rc, extra_output_buffer, OUTPUT_BUFFER_SIZE);
+        pcut_report_test_done_unparsed(test, outcome, extra_output_buffer, OUTPUT_BUFFER_SIZE);
+
+        return outcome;
 }