New upstream version 1.8

[debian/gzip] / tests / zgrep-signal

diff --git a/tests/zgrep-signal b/tests/zgrep-signal
index 3a9c089d29c6fa428b230c7464fe478db9353e34..13783ef1001cecacbfb087b12cce643867e2e71c 100755 (executable)
--- a/tests/zgrep-signal
+++ b/tests/zgrep-signal
@@ -2,7 +2,7 @@
 # Check that zgrep is terminated gracefully by signal when
 # its grep/sed pipeline is terminated by a signal.
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2016 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
@@ -23,34 +23,42 @@
 echo a | gzip -c > f.gz || framework_failure_
 
 test "x$PERL" = x && PERL=perl
-("$PERL" -e 'use warnings') >/dev/null 2>&1 || skip_ "no suitable perl found"
+("$PERL" -e 'use POSIX qw(dup2)') >/dev/null 2>&1 ||
+   skip_ "no suitable perl found"
 
-exec_with_SIGPIPE_SIG_DFL () {
+# Run the arguments as a command, in a process where stdout is a
+# dangling pipe and SIGPIPE has the default signal-handling action.
+# This can't be done portably in the shell, because if SIGPIPE is
+# ignored when the shell is entered, the shell might refuse to trap
+# it.  Fall back on Perl+POSIX, if available.  Take care to close the
+# pipe's read end before running the program; the equivalent of the
+# shell's "command | :" has a race condition in that COMMAND could
+# write before ":" exits.
+write_to_dangling_pipe () {
   program=${1?}
   shift
   args=
   for arg; do
     args="$args, '$arg'"
   done
-  "$PERL" -e "\$SIG{PIPE} = 'DEFAULT'; exec '$program'$args"
+  "$PERL" -e '
+     use POSIX qw(dup2);
+     $SIG{PIPE} = "DEFAULT";
+     pipe my ($read_end, $write_end) or die "pipe: $!\n";
+     dup2 fileno $write_end, 1 or die "dup2: $!\n";
+     close $read_end or die "close: $!\n";
+     exec '"'$program'$args"';
+  '
 }
 
-write_to_dangling_pipe () {
-  exec 3>&1
-  (
-    exec_with_SIGPIPE_SIG_DFL "$@"
-    echo $? >&3
-  ) | : || framework_failure_
-}
-
-signal_status=$(write_to_dangling_pipe cat f.gz f.gz)
+write_to_dangling_pipe cat f.gz f.gz
+signal_status=$?
 test 128 -lt $signal_status ||
   framework_failure_ 'signal handling busted on this host'
 
 fail=0
 
-st=$(write_to_dangling_pipe zgrep a f.gz f.gz)
-
-test $st = $signal_status || fail=1
+write_to_dangling_pipe zgrep a f.gz f.gz
+test $? -eq $signal_status || fail=1
 
 Exit $fail