Changeset 9eb1ff5 in mainline for uspace/lib/pcut/src/os/generic.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/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>
@@ -94 +95 @@
 static int convert_wait_status_to_outcome(int status) {
         if (status < 0) {
-                return TEST_OUTCOME_ERROR;
+                return PCUT_OUTCOME_INTERNAL_ERROR;
         } else if (status == 0) {
-                return TEST_OUTCOME_PASS;
+                return PCUT_OUTCOME_PASS;
         } else {
-                return TEST_OUTCOME_FAIL;
+                return PCUT_OUTCOME_FAIL;
         }
 }
@@ -107 +108 @@
  * @param test Test to be run.
  */
-void pcut_run_test_forking(const char *self_path, pcut_item_t *test) {
-        int rc;
+int pcut_run_test_forking(const char *self_path, pcut_item_t *test) {
+        int rc, outcome;
         FILE *tempfile;
         char tempfile_name[PCUT_TEMP_FILENAME_BUFFER_SIZE];
@@ -126 +127 @@
         PCUT_DEBUG("system() returned 0x%04X", rc);
 
-        rc = convert_wait_status_to_outcome(rc);
+        outcome = 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;
+                return PCUT_OUTCOME_INTERNAL_ERROR;
         }
 
         fread(extra_output_buffer, 1, OUTPUT_BUFFER_SIZE, tempfile);
         fclose(tempfile);
-        unlink(tempfile_name);
+        remove(tempfile_name);
 
-        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;
 }