>From fbb40ec10e333cff0b9845572065edd9e66eac79 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 10 Jun 2019 16:17:35 +0200 Subject: [PATCH 3/5] posix_spawn_file_actions_addfchdir: Add tests. * tests/test-posix_spawn_file_actions_addfchdir.c: New file. * tests/test-posix_spawn5.c: New file. * modules/posix_spawn_file_actions_addfchdir-tests: New file. --- ChangeLog | 7 ++ modules/posix_spawn_file_actions_addfchdir-tests | 20 +++ tests/test-posix_spawn5.c | 148 +++++++++++++++++++++++ tests/test-posix_spawn_file_actions_addfchdir.c | 44 +++++++ 4 files changed, 219 insertions(+) create mode 100644 modules/posix_spawn_file_actions_addfchdir-tests create mode 100644 tests/test-posix_spawn5.c create mode 100644 tests/test-posix_spawn_file_actions_addfchdir.c diff --git a/ChangeLog b/ChangeLog index ecf1d47..7bbf5fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2019-06-10 Bruno Haible + posix_spawn_file_actions_addfchdir: Add tests. + * tests/test-posix_spawn_file_actions_addfchdir.c: New file. + * tests/test-posix_spawn5.c: New file. + * modules/posix_spawn_file_actions_addfchdir-tests: New file. + +2019-06-10 Bruno Haible + posix_spawn_file_actions_addfchdir: New module. * lib/spawn.in.h (posix_spawn_file_actions_addfchdir): New declaration. * lib/spawn_int.h (struct __spawn_action): Add tag 'spawn_do_fchdir' and diff --git a/modules/posix_spawn_file_actions_addfchdir-tests b/modules/posix_spawn_file_actions_addfchdir-tests new file mode 100644 index 0000000..5e50695 --- /dev/null +++ b/modules/posix_spawn_file_actions_addfchdir-tests @@ -0,0 +1,20 @@ +Files: +tests/test-posix_spawn_file_actions_addfchdir.c +tests/test-posix_spawn5.c +tests/signature.h +tests/macros.h + +Depends-on: +posix_spawn_file_actions_init +posix_spawnp-tests + +configure.ac: + +Makefile.am: +TESTS += test-posix_spawn_file_actions_addfchdir +check_PROGRAMS += test-posix_spawn_file_actions_addfchdir + +if POSIX_SPAWN_PORTED +TESTS += test-posix_spawn5 +check_PROGRAMS += test-posix_spawn5 +endif diff --git a/tests/test-posix_spawn5.c b/tests/test-posix_spawn5.c new file mode 100644 index 0000000..805f666 --- /dev/null +++ b/tests/test-posix_spawn5.c @@ -0,0 +1,148 @@ +/* Test of posix_spawn() function with 'fchdir' action. + Copyright (C) 2008-2019 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Bruno Haible , 2018. */ + +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int +fd_safer (int fd) +{ + if (0 <= fd && fd <= 2) + { + int f = fd_safer (dup (fd)); + int e = errno; + close (fd); + errno = e; + fd = f; + } + + return fd; +} + +int +main () +{ + char *argv[2] = { (char *) "pwd", NULL }; + int rootfd; + int ifd[2]; + sigset_t blocked_signals; + sigset_t fatal_signal_set; + posix_spawn_file_actions_t actions; + bool actions_allocated; + posix_spawnattr_t attrs; + bool attrs_allocated; + int err; + pid_t child; + int fd; + FILE *fp; + char line[80]; + int status; + int exitstatus; + + rootfd = open ("/", O_RDONLY); + if (rootfd < 0) + { + perror ("cannot open directory"); + exit (1); + } + if (pipe (ifd) < 0 || (ifd[0] = fd_safer (ifd[0])) < 0) + { + perror ("cannot create pipe"); + exit (1); + } + sigprocmask (SIG_SETMASK, NULL, &blocked_signals); + sigemptyset (&fatal_signal_set); + sigaddset (&fatal_signal_set, SIGINT); + sigaddset (&fatal_signal_set, SIGTERM); + sigaddset (&fatal_signal_set, SIGHUP); + sigaddset (&fatal_signal_set, SIGPIPE); + sigprocmask (SIG_BLOCK, &fatal_signal_set, NULL); + actions_allocated = false; + attrs_allocated = false; + if ((err = posix_spawn_file_actions_init (&actions)) != 0 + || (actions_allocated = true, + (err = posix_spawn_file_actions_adddup2 (&actions, ifd[1], STDOUT_FILENO)) != 0 + || (err = posix_spawn_file_actions_addclose (&actions, ifd[1])) != 0 + || (err = posix_spawn_file_actions_addclose (&actions, ifd[0])) != 0 + || (err = posix_spawn_file_actions_addopen (&actions, STDIN_FILENO, "/dev/null", O_RDONLY, 0)) != 0 + || (err = posix_spawn_file_actions_addfchdir (&actions, rootfd)) != 0 + || (err = posix_spawnattr_init (&attrs)) != 0 + || (attrs_allocated = true, + (err = posix_spawnattr_setsigmask (&attrs, &blocked_signals)) != 0 + || (err = posix_spawnattr_setflags (&attrs, POSIX_SPAWN_SETSIGMASK)) != 0) + || (err = posix_spawnp (&child, "pwd", &actions, &attrs, argv, environ)) != 0)) + { + if (actions_allocated) + posix_spawn_file_actions_destroy (&actions); + if (attrs_allocated) + posix_spawnattr_destroy (&attrs); + sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL); + errno = err; + perror ("subprocess failed"); + exit (1); + } + posix_spawn_file_actions_destroy (&actions); + posix_spawnattr_destroy (&attrs); + sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL); + close (ifd[1]); + fd = ifd[0]; + fp = fdopen (fd, "r"); + if (fp == NULL) + { + fprintf (stderr, "fdopen() failed\n"); + exit (1); + } + if (fread (line, 1, 80, fp) < 2) + { + fprintf (stderr, "could not read expected output\n"); + exit (1); + } + if (memcmp (line, "/\n", 2) != 0) + { + fprintf (stderr, "read output is not the expected output"); + exit (1); + } + fclose (fp); + status = 0; + while (waitpid (child, &status, 0) != child) + ; + if (!WIFEXITED (status)) + { + fprintf (stderr, "subprocess terminated with unexpected wait status %d\n", status); + exit (1); + } + exitstatus = WEXITSTATUS (status); + if (exitstatus != 0) + { + fprintf (stderr, "subprocess terminated with unexpected exit status %d\n", exitstatus); + exit (1); + } + return 0; +} diff --git a/tests/test-posix_spawn_file_actions_addfchdir.c b/tests/test-posix_spawn_file_actions_addfchdir.c new file mode 100644 index 0000000..d7df690 --- /dev/null +++ b/tests/test-posix_spawn_file_actions_addfchdir.c @@ -0,0 +1,44 @@ +/* Test posix_spawn_file_actions_addfchdir() function. + Copyright (C) 2018-2019 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include + +#include "signature.h" +SIGNATURE_CHECK (posix_spawn_file_actions_addfchdir, int, + (posix_spawn_file_actions_t *, int)); + +#include +#include +#include +#include + +#include "macros.h" + +int +main (void) +{ + posix_spawn_file_actions_t actions; + + ASSERT (posix_spawn_file_actions_init (&actions) == 0); + + ASSERT (posix_spawn_file_actions_addfchdir (&actions, 3) == 0); + + posix_spawn_file_actions_destroy (&actions); + + return 0; +} -- 2.7.4