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

Timestamp:

2017-12-08T14:47:08Z (7 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/helenos.c (modified) (6 diffs)

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

@@ -154 +154 @@
  * @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) {
         before_test_start(test);
 
@@ -161 +161 @@
         int tempfile = vfs_lookup_open(tempfile_name, WALK_REGULAR | WALK_MAY_CREATE, MODE_READ | MODE_WRITE);
         if (tempfile < 0) {
-                pcut_report_test_done(test, TEST_OUTCOME_ERROR, "Failed to create temporary file.", NULL, NULL);
-                return;
+                pcut_report_test_done(test, PCUT_OUTCOME_INTERNAL_ERROR, "Failed to create temporary file.", NULL, NULL);
+                return PCUT_OUTCOME_INTERNAL_ERROR;
         }
 
@@ -174 +174 @@
         };
 
-        int status = TEST_OUTCOME_PASS;
+        int status = PCUT_OUTCOME_PASS;
 
         task_wait_t test_task_wait;
@@ -180 +180 @@
             fileno(stdin), tempfile, tempfile);
         if (rc != EOK) {
-                status = TEST_OUTCOME_ERROR;
+                status = PCUT_OUTCOME_INTERNAL_ERROR;
                 goto leave_close_tempfile;
         }
@@ -198 +198 @@
         rc = task_wait(&test_task_wait, &task_exit, &task_retval);
         if (rc != EOK) {
-                status = TEST_OUTCOME_ERROR;
+                status = PCUT_OUTCOME_INTERNAL_ERROR;
                 goto leave_close_tempfile;
         }
         if (task_exit == TASK_EXIT_UNEXPECTED) {
-                status = TEST_OUTCOME_ERROR;
+                status = PCUT_OUTCOME_INTERNAL_ERROR;
         } else {
-                status = task_retval == 0 ? TEST_OUTCOME_PASS : TEST_OUTCOME_FAIL;
+                status = task_retval == 0 ? PCUT_OUTCOME_PASS : PCUT_OUTCOME_FAIL;
         }
 
@@ -221 +221 @@
 
         pcut_report_test_done_unparsed(test, status, extra_output_buffer, OUTPUT_BUFFER_SIZE);
+
+        return status;
 }