X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Fremfiles01.at;h=948903a8d15c22c4d1420d56e5f8ed40d8e7cc0a;hb=5cb79ed51999e36add131116d3d3db586be9870e;hp=73752b4a450d72bdc17abd5f2af43be6a5cbb663;hpb=67b4f3519d838c6f16f5b6b63c0b9b8669fb3dd9;p=chaz%2Ftar

diff --git a/tests/remfiles01.at b/tests/remfiles01.at
index 73752b4..948903a 100644
--- a/tests/remfiles01.at
+++ b/tests/remfiles01.at
@@ -1,22 +1,22 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright 2009, 2013 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# This file is part of GNU tar.
+
+# GNU tar 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, or (at your option)
-# any later version.
+# 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,
+# GNU tar 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Description: When called with --create --remove-files and a compression
 # options tar (v. <= 1.22.90) would remove files even if it had failed
@@ -32,6 +32,7 @@ unset TAR_OPTIONS
 AT_CHECK([
 AT_UNPRIVILEGED_PREREQ
 AT_GZIP_PREREQ
+AT_SIGPIPE_PREREQ
 AT_SORT_PREREQ
 
 mkdir dir
@@ -47,7 +48,11 @@ mkdir c
 # or
 #  tar: Child returned status 2
 
-tar -c -f a -z --remove-files b c 2>err
+# Discard diagnostics that some shells generate about broken pipes,
+# and discard all of tar's diagnostics except for the ones saying "(child)".
+# Gzip's exit code is propagated to the shell.  Usually it is 141.
+# Convert all non-zero exits to 2 to make it predictable.
+(tar -c -f a -z --remove-files b c 2>err || (exit 2) ) 2>/dev/null
 EC=$?
 sed -n '/(child)/p' err >&2
 rm err