]> Savannah Git Hosting - gnulib.git/commitdiff
posix_spawnp-tests: Rename test.
authorBruno Haible <bruno@clisp.org>
Thu, 17 Dec 2020 01:44:31 +0000 (02:44 +0100)
committerBruno Haible <bruno@clisp.org>
Thu, 17 Dec 2020 01:44:31 +0000 (02:44 +0100)
* tests/test-posix_spawn-dup2-stdin.c: Renamed from
tests/test-posix_spawn2.c.
* tests/test-posix_spawn-dup2-stdin.in.sh: Renamed from
tests/test-posix_spawn2.in.sh.
* modules/posix_spawnp-tests (Files, Makefile.am): Update.

ChangeLog
modules/posix_spawnp-tests
tests/test-posix_spawn-dup2-stdin.c [new file with mode: 0644]
tests/test-posix_spawn-dup2-stdin.in.sh [new file with mode: 0644]
tests/test-posix_spawn2.c [deleted file]
tests/test-posix_spawn2.in.sh [deleted file]

index e80c3f12a22afb15e680996cdc5692658af2f92b..8d959997bb4e839c6d295e6cccf0aa1ed55470cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2020-12-16  Bruno Haible  <bruno@clisp.org>
 
+       posix_spawnp-tests: Rename test.
+       * tests/test-posix_spawn-dup2-stdin.c: Renamed from
+       tests/test-posix_spawn2.c.
+       * tests/test-posix_spawn-dup2-stdin.in.sh: Renamed from
+       tests/test-posix_spawn2.in.sh.
+       * modules/posix_spawnp-tests (Files, Makefile.am): Update.
+
        posix_spawnp-tests: Rename test.
        * tests/test-posix_spawn-dup2-stdout.c: Renamed from
        tests/test-posix_spawn1.c.
index 14bbcda36ab9d3c074f4b7f6512ac4eed715bfd0..1f6bbc7b6ed42eb0c97b1d1d757402361e9971d4 100644 (file)
@@ -1,8 +1,8 @@
 Files:
 tests/test-posix_spawn-dup2-stdout.c
 tests/test-posix_spawn-dup2-stdout.in.sh
-tests/test-posix_spawn2.c
-tests/test-posix_spawn2.in.sh
+tests/test-posix_spawn-dup2-stdin.c
+tests/test-posix_spawn-dup2-stdin.in.sh
 tests/signature.h
 
 Depends-on:
@@ -35,8 +35,8 @@ AM_CONDITIONAL([POSIX_SPAWN_PORTED], [test $posix_spawn_ported = yes])
 
 Makefile.am:
 if POSIX_SPAWN_PORTED
-TESTS += test-posix_spawn-dup2-stdout test-posix_spawn2
-check_PROGRAMS += test-posix_spawn-dup2-stdout test-posix_spawn2
+TESTS += test-posix_spawn-dup2-stdout test-posix_spawn-dup2-stdin
+check_PROGRAMS += test-posix_spawn-dup2-stdout test-posix_spawn-dup2-stdin
 
 BUILT_SOURCES += test-posix_spawn-dup2-stdout.sh
 test-posix_spawn-dup2-stdout.sh: test-posix_spawn-dup2-stdout.in.sh
@@ -45,10 +45,10 @@ test-posix_spawn-dup2-stdout.sh: test-posix_spawn-dup2-stdout.in.sh
        mv $@-t $@
 MOSTLYCLEANFILES += test-posix_spawn-dup2-stdout.sh test-posix_spawn-dup2-stdout.sh-t
 
-BUILT_SOURCES += test-posix_spawn2.sh
-test-posix_spawn2.sh: test-posix_spawn2.in.sh
+BUILT_SOURCES += test-posix_spawn-dup2-stdin.sh
+test-posix_spawn-dup2-stdin.sh: test-posix_spawn-dup2-stdin.in.sh
        $(AM_V_GEN)rm -f $@-t $@ && \
-       cp $(srcdir)/test-posix_spawn2.in.sh $@-t && \
+       cp $(srcdir)/test-posix_spawn-dup2-stdin.in.sh $@-t && \
        mv $@-t $@
-MOSTLYCLEANFILES += test-posix_spawn2.sh test-posix_spawn2.sh-t
+MOSTLYCLEANFILES += test-posix_spawn-dup2-stdin.sh test-posix_spawn-dup2-stdin.sh-t
 endif
diff --git a/tests/test-posix_spawn-dup2-stdin.c b/tests/test-posix_spawn-dup2-stdin.c
new file mode 100644 (file)
index 0000000..bec33fc
--- /dev/null
@@ -0,0 +1,137 @@
+/* Test of posix_spawn() function.
+   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 <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2008.  */
+
+#include <config.h>
+
+#include <spawn.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#define CHILD_PROGRAM_FILENAME "test-posix_spawn-dup2-stdin.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] = { (char *) BOURNE_SHELL, (char *) 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, BOURNE_SHELL, &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_spawn-dup2-stdin.in.sh b/tests/test-posix_spawn-dup2-stdin.in.sh
new file mode 100644 (file)
index 0000000..29a9b28
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+read line
+test "$line" = "Halle Potta"
diff --git a/tests/test-posix_spawn2.c b/tests/test-posix_spawn2.c
deleted file mode 100644 (file)
index fb73c0e..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Test of posix_spawn() function.
-   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 <https://www.gnu.org/licenses/>.  */
-
-/* Written by Bruno Haible <bruno@clisp.org>, 2008.  */
-
-#include <config.h>
-
-#include <spawn.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#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] = { (char *) BOURNE_SHELL, (char *) 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, BOURNE_SHELL, &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
deleted file mode 100644 (file)
index 29a9b28..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-read line
-test "$line" = "Halle Potta"