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

Timestamp:

2017-03-07T20:47:35Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a737667e

Parents:

e796dc8

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-07 20:47:35)

git-committer:

Jakub Jermar <jakub@…> (2017-03-07 20:47:35)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1941-1944

Original commit messages:

1944: Jiri Zarevucky 2013-08-06 Replace legacy file descriptor presetting with inbox.
1943: Jiri Zarevucky 2013-08-06 Do not preserve open state when passing file descriptor to another task. Allow receiver to specify, whether the descriptor is low or high.
1942: Jiri Zarevucky 2013-08-06 C style.
1941: Jiri Zarevucky 2013-08-06 Make loader accept file reference instead of a pathname.

Modifications:

• Keep version of elf_load_file() that accepts file name
• Changes required for loading dynamically linked executables
• Update to newer list_foreach

File:

• uspace/lib/pcut/src/os/helenos.c (modified) (2 diffs)

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

@@ -170 +170 @@
         snprintf(test_number_argument, MAX_TEST_NUMBER_WIDTH, "-t%d", test->id);
 
-        int *files[4];
-        int fd_stdin = fileno(stdin);
-        files[0] = &fd_stdin;
-        files[1] = &tempfile;
-        files[2] = &tempfile;
-        files[3] = NULL;
-
         const char *const arguments[3] = {
                 self_path,
@@ -186 +179 @@
 
         task_wait_t test_task_wait;
-        int rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments, files);
+        int rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments,
+            fileno(stdin), tempfile, tempfile);
         if (rc != EOK) {
                 status = TEST_OUTCOME_ERROR;