From 7a3dd56e54ef658e2827071e03e143d32e422019 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 29 Sep 2008 21:42:51 +0200 Subject: [PATCH] A new test for posix_spawn. --- ChangeLog | 10 ++ modules/posix_spawnp-tests | 24 ++- tests/{test-posix_spawn.c => test-posix_spawn1.c} | 2 +- ...t-posix_spawn.in.sh => test-posix_spawn1.in.sh} | 0 tests/test-posix_spawn2.c | 168 +++++++++++++++++++++ tests/test-posix_spawn2.in.sh | 3 + 6 files changed, 198 insertions(+), 9 deletions(-) rename tests/{test-posix_spawn.c => test-posix_spawn1.c} (98%) rename tests/{test-posix_spawn.in.sh => test-posix_spawn1.in.sh} (100%) create mode 100644 tests/test-posix_spawn2.c create mode 100644 tests/test-posix_spawn2.in.sh diff --git a/ChangeLog b/ChangeLog index c5412b2ce..76c7363cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2008-09-29 Bruno Haible + * tests/test-posix_spawn1.c: Renamed from tests/test-posix_spawn.c. + * tests/test-posix_spawn1.in.sh: Renamed from + tests/test-posix_spawn.in.sh. + * tests/test-posix_spawn2.c: New file. + * tests/test-posix_spawn2.in.sh: New file. + * modules/posix_spawnp-tests (Files): Update. + (Makefile.am): Update. Add test-posix_spawn2 to the tests. + +2008-09-29 Bruno Haible + Propagate effects of putenv/setenv/unsetenv to child processes. * lib/execute.c (execute): Use spawnvpe instead of spawnvp. * lib/pipe.c (create_pipe): Likewise. diff --git a/modules/posix_spawnp-tests b/modules/posix_spawnp-tests index f9dbe84ca..7db28e826 100644 --- a/modules/posix_spawnp-tests +++ b/modules/posix_spawnp-tests @@ -1,6 +1,8 @@ Files: -tests/test-posix_spawn.c -tests/test-posix_spawn.in.sh +tests/test-posix_spawn1.c +tests/test-posix_spawn1.in.sh +tests/test-posix_spawn2.c +tests/test-posix_spawn2.in.sh Depends-on: posix_spawn_file_actions_init @@ -19,11 +21,17 @@ unistd configure.ac: Makefile.am: -TESTS += test-posix_spawn -check_PROGRAMS += test-posix_spawn +TESTS += test-posix_spawn1 test-posix_spawn2 +check_PROGRAMS += test-posix_spawn1 test-posix_spawn2 -BUILT_SOURCES += test-posix_spawn.sh -test-posix_spawn.sh: test-posix_spawn.in.sh - cp $(srcdir)/test-posix_spawn.in.sh $@-t +BUILT_SOURCES += test-posix_spawn1.sh +test-posix_spawn1.sh: test-posix_spawn1.in.sh + cp $(srcdir)/test-posix_spawn1.in.sh $@-t mv $@-t $@ -MOSTLYCLEANFILES += test-posix_spawn.sh test-posix_spawn.sh-t +MOSTLYCLEANFILES += test-posix_spawn1.sh test-posix_spawn1.sh-t + +BUILT_SOURCES += test-posix_spawn2.sh +test-posix_spawn2.sh: test-posix_spawn2.in.sh + cp $(srcdir)/test-posix_spawn2.in.sh $@-t + mv $@-t $@ +MOSTLYCLEANFILES += test-posix_spawn2.sh test-posix_spawn2.sh-t diff --git a/tests/test-posix_spawn.c b/tests/test-posix_spawn1.c similarity index 98% rename from tests/test-posix_spawn.c rename to tests/test-posix_spawn1.c index 59a418dc1..80a91d161 100644 --- a/tests/test-posix_spawn.c +++ b/tests/test-posix_spawn1.c @@ -62,7 +62,7 @@ extern char **environ; # define WIFSTOPPED(x) (WTERMSIG (x) == 0x7f) #endif -#define CHILD_PROGRAM_FILENAME "test-posix_spawn.sh" +#define CHILD_PROGRAM_FILENAME "test-posix_spawn1.sh" static int fd_safer (int fd) diff --git a/tests/test-posix_spawn.in.sh b/tests/test-posix_spawn1.in.sh similarity index 100% rename from tests/test-posix_spawn.in.sh rename to tests/test-posix_spawn1.in.sh diff --git a/tests/test-posix_spawn2.c b/tests/test-posix_spawn2.c new file mode 100644 index 000000000..174f1a0bc --- /dev/null +++ b/tests/test-posix_spawn2.c @@ -0,0 +1,168 @@ +/* Test of posix_spawn() function. + Copyright (C) 2008 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 , 2008. */ + +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern char **environ; + +#ifndef STDIN_FILENO +# define STDIN_FILENO 0 +#endif +#ifndef STDOUT_FILENO +# define STDOUT_FILENO 1 +#endif +#ifndef STDERR_FILENO +# define STDERR_FILENO 2 +#endif + +#ifndef WTERMSIG +# define WTERMSIG(x) ((x) & 0x7f) +#endif +#ifndef WCOREDUMP +# define WCOREDUMP(x) ((x) & 0x80) +#endif +#ifndef WEXITSTATUS +# define WEXITSTATUS(x) (((x) >> 8) & 0xff) +#endif +#ifndef WIFSIGNALED +# define WIFSIGNALED(x) (WTERMSIG (x) != 0 && WTERMSIG(x) != 0x7f) +#endif +#ifndef WIFEXITED +# define WIFEXITED(x) (WTERMSIG (x) == 0) +#endif +#ifndef WIFSTOPPED +# define WIFSTOPPED(x) (WTERMSIG (x) == 0x7f) +#endif + +#define CHILD_PROGRAM_FILENAME "test-posix_spawn2.sh" + +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[3] = { "/bin/sh", CHILD_PROGRAM_FILENAME, NULL }; + int ofd[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; + int written; + int status; + int exitstatus; + + if (pipe (ofd) < 0 || (ofd[1] = fd_safer (ofd[1])) < 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, ofd[0], STDIN_FILENO)) != 0 + || (err = posix_spawn_file_actions_addclose (&actions, ofd[0])) != 0 + || (err = posix_spawn_file_actions_addclose (&actions, ofd[1])) != 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, "/bin/sh", &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 (ofd[0]); + fd = ofd[1]; + fp = fdopen (fd, "w"); + if (fp == NULL) + { + fprintf (stderr, "fdopen() failed\n"); + exit (1); + } + written = fwrite ("Halle Potta\n", 1, 12, fp); + if (written < 12) + { + fprintf (stderr, "could not write input\n"); + 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_spawn2.in.sh b/tests/test-posix_spawn2.in.sh new file mode 100644 index 000000000..29a9b28f3 --- /dev/null +++ b/tests/test-posix_spawn2.in.sh @@ -0,0 +1,3 @@ +#!/bin/sh +read line +test "$line" = "Halle Potta" -- 2.11.0