From: Bruno Haible Date: Thu, 17 Dec 2020 01:56:21 +0000 (+0100) Subject: posix_spawn_file_actions_addchdir-tests: Rename test. X-Git-Tag: v1.0~3363 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=956dc62cfd4a2200931cd5c058f50585c4e5471a;p=gnulib.git posix_spawn_file_actions_addchdir-tests: Rename test. * tests/test-posix_spawn-chdir.c: Renamed from tests/test-posix_spawn4.c. * modules/posix_spawn_file_actions_addchdir-tests (Files, Makefile.am): Update. --- diff --git a/ChangeLog b/ChangeLog index 46d584be5d..db3ed06a09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2020-12-16 Bruno Haible + posix_spawn_file_actions_addchdir-tests: Rename test. + * tests/test-posix_spawn-chdir.c: Renamed from + tests/test-posix_spawn4.c. + * modules/posix_spawn_file_actions_addchdir-tests (Files, Makefile.am): + Update. + posix_spawn-tests: Rename test. * tests/test-posix_spawn-open1.c: Renamed from tests/test-posix_spawn3.c. diff --git a/modules/posix_spawn_file_actions_addchdir-tests b/modules/posix_spawn_file_actions_addchdir-tests index d5af0ae0ef..400c1f72ee 100644 --- a/modules/posix_spawn_file_actions_addchdir-tests +++ b/modules/posix_spawn_file_actions_addchdir-tests @@ -1,6 +1,6 @@ Files: tests/test-posix_spawn_file_actions_addchdir.c -tests/test-posix_spawn4.c +tests/test-posix_spawn-chdir.c tests/signature.h tests/macros.h @@ -16,6 +16,6 @@ TESTS += test-posix_spawn_file_actions_addchdir check_PROGRAMS += test-posix_spawn_file_actions_addchdir if POSIX_SPAWN_PORTED -TESTS += test-posix_spawn4 -check_PROGRAMS += test-posix_spawn4 +TESTS += test-posix_spawn-chdir +check_PROGRAMS += test-posix_spawn-chdir endif diff --git a/tests/test-posix_spawn-chdir.c b/tests/test-posix_spawn-chdir.c new file mode 100644 index 0000000000..91a5497ede --- /dev/null +++ b/tests/test-posix_spawn-chdir.c @@ -0,0 +1,162 @@ +/* Test of posix_spawn() function with 'chdir' action. + Copyright (C) 2008-2020 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 + +#include "findprog.h" + +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; +} + +static void +test (const char *pwd_prog) +{ + char *argv[2] = { (char *) "pwd", NULL }; + 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; + + 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_addchdir (&actions, "/")) != 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_prog, &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); + } +} + +int +main () +{ + test ("pwd"); + + /* Verify that if a program is given as a relative file name with at least one + slash, it is interpreted w.r.t. the current directory after chdir has been + executed. */ + { + const char *abs_pwd_prog = find_in_path ("pwd"); + + if (abs_pwd_prog != NULL + && abs_pwd_prog[0] == '/' + && abs_pwd_prog[1] != '0' && abs_pwd_prog[1] != '/') + test (&abs_pwd_prog[1]); + } + + return 0; +} diff --git a/tests/test-posix_spawn4.c b/tests/test-posix_spawn4.c deleted file mode 100644 index 91a5497ede..0000000000 --- a/tests/test-posix_spawn4.c +++ /dev/null @@ -1,162 +0,0 @@ -/* Test of posix_spawn() function with 'chdir' action. - Copyright (C) 2008-2020 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 - -#include "findprog.h" - -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; -} - -static void -test (const char *pwd_prog) -{ - char *argv[2] = { (char *) "pwd", NULL }; - 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; - - 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_addchdir (&actions, "/")) != 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_prog, &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); - } -} - -int -main () -{ - test ("pwd"); - - /* Verify that if a program is given as a relative file name with at least one - slash, it is interpreted w.r.t. the current directory after chdir has been - executed. */ - { - const char *abs_pwd_prog = find_in_path ("pwd"); - - if (abs_pwd_prog != NULL - && abs_pwd_prog[0] == '/' - && abs_pwd_prog[1] != '0' && abs_pwd_prog[1] != '/') - test (&abs_pwd_prog[1]); - } - - return 0; -}