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

File:

• uspace/lib/pcut/src/os/generic.c (modified) (4 diffs)

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

@@ -34 +34 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <sys/types.h>
 #include <errno.h>
 #include <assert.h>
@@ -95 +94 @@
 static int convert_wait_status_to_outcome(int status) {
         if (status < 0) {
-                return PCUT_OUTCOME_INTERNAL_ERROR;
+                return TEST_OUTCOME_ERROR;
         } else if (status == 0) {
-                return PCUT_OUTCOME_PASS;
+                return TEST_OUTCOME_PASS;
         } else {
-                return PCUT_OUTCOME_FAIL;
+                return TEST_OUTCOME_FAIL;
         }
 }
@@ -108 +107 @@
  * @param test Test to be run.
  */
-int pcut_run_test_forking(const char *self_path, pcut_item_t *test) {
-        int rc, outcome;
+void pcut_run_test_forking(const char *self_path, pcut_item_t *test) {
+        int rc;
         FILE *tempfile;
         char tempfile_name[PCUT_TEMP_FILENAME_BUFFER_SIZE];
@@ -127 +126 @@
         PCUT_DEBUG("system() returned 0x%04X", rc);
 
-        outcome = convert_wait_status_to_outcome(rc);
+        rc = convert_wait_status_to_outcome(rc);
 
         tempfile = fopen(tempfile_name, "rb");
         if (tempfile == NULL) {
                 pcut_report_test_done(test, TEST_OUTCOME_ERROR, "Failed to open temporary file.", NULL, NULL);
-                return PCUT_OUTCOME_INTERNAL_ERROR;
+                return;
         }
 
         fread(extra_output_buffer, 1, OUTPUT_BUFFER_SIZE, tempfile);
         fclose(tempfile);
-        remove(tempfile_name);
+        unlink(tempfile_name);
 
-        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);
 }