Changes in uspace/lib/pcut/src/os/unix.c [9eb1ff5:8d2dd7f2] in mainline

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