Changeset 132ab5d1 in mainline for uspace/lib/pcut/src/os/helenos.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/pcut/src/os/helenos.c (modified) (5 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);
 
         char tempfile_name[PCUT_TEMP_FILENAME_BUFFER_SIZE];
         snprintf(tempfile_name, PCUT_TEMP_FILENAME_BUFFER_SIZE - 1, "pcut_%lld.tmp", (unsigned long long) task_get_id());
-        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;
+        int tempfile;
+        int rc = vfs_lookup_open(tempfile_name, WALK_REGULAR | WALK_MAY_CREATE, MODE_READ | MODE_WRITE, &tempfile);
+        if (rc != EOK) {
+                pcut_report_test_done(test, PCUT_OUTCOME_INTERNAL_ERROR, "Failed to create temporary file.", NULL, NULL);
+                return PCUT_OUTCOME_INTERNAL_ERROR;
         }
 
@@ -174 +175 @@
         };
 
-        int status = TEST_OUTCOME_PASS;
+        int status = PCUT_OUTCOME_PASS;
 
         task_wait_t test_task_wait;
-        int rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments,
+        rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments,
             fileno(stdin), tempfile, tempfile);
         if (rc != EOK) {
-                status = TEST_OUTCOME_ERROR;
+                status = PCUT_OUTCOME_INTERNAL_ERROR;
                 goto leave_close_tempfile;
         }
@@ -198 +199 @@
         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;
         }
 
@@ -213 +214 @@
 
         aoff64_t pos = 0;
-        vfs_read(tempfile, &pos, extra_output_buffer, OUTPUT_BUFFER_SIZE);
+        size_t nread;
+        vfs_read(tempfile, &pos, extra_output_buffer, OUTPUT_BUFFER_SIZE, &nread);
 
 leave_close_tempfile:
@@ -220 +222 @@
 
         pcut_report_test_done_unparsed(test, status, extra_output_buffer, OUTPUT_BUFFER_SIZE);
+
+        return status;
 }