From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Fri, 11 Nov 2005 12:17:38 +0000 (+0000)
Subject: Close stdin so that if something fails causing tar to ask for the next volume, it... 
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=c81a5e8bf5f028859e24b2231c9751bbd6b6fdc4;p=chaz%2Ftar

Close stdin so that if something fails causing tar to ask for the next volume, it won't hang the testsuite.
---

diff --git a/tests/multiv01.at b/tests/multiv01.at
index 3e2053c..0c90a59 100644
--- a/tests/multiv01.at
+++ b/tests/multiv01.at
@@ -28,6 +28,7 @@ AT_KEYWORDS([multivolume multiv multiv01])
 #  TRUSS=strace
 
 AT_TAR_CHECK([
+exec <&-
 genfile --length 7168 > file1
 
 for block in " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" \
diff --git a/tests/multiv02.at b/tests/multiv02.at
index ab629bd..313b3ad 100644
--- a/tests/multiv02.at
+++ b/tests/multiv02.at
@@ -34,6 +34,8 @@ genfile --length 20000 > to
 genfile --length 20000 > tre
 genfile --length 10240 > fire
 
+exec <&-
+
 tar -c -f A.tar -f B.tar -f C.tar -M -L 30 en to tre fire || exit 1
 echo separator
 tar -v -x -f A.tar -f B.tar -f C.tar -M en || exit 1
diff --git a/tests/multiv03.at b/tests/multiv03.at
index 88f4cbf..84e66d8 100644
--- a/tests/multiv03.at
+++ b/tests/multiv03.at
@@ -43,6 +43,8 @@ EOF
 
 genfile --length 15360 > $AFILE
 
+exec <&-
+
 tar -M -L 10 -c -f arch.1 -f arch.2 $AFILE || exit 1
 tar -tM -f arch.1 -f arch.2 || exit 1
 
diff --git a/tests/multiv04.at b/tests/multiv04.at
index 6cd0d3c..50ea290 100644
--- a/tests/multiv04.at
+++ b/tests/multiv04.at
@@ -41,6 +41,8 @@ AT_TAR_CHECK([
 mkdir directory
 awk 'BEGIN { for (i = 0; i < 1024; i++) printf("genfile -f directory/%014X\n", i); }' </dev/null | sh
 
+exec <&-
+
 sleep 2
 
 tar --listed-incremental=list -c -f archive.a directory
diff --git a/tests/sparsemv.at b/tests/sparsemv.at
index 2f36b23..a17350a 100644
--- a/tests/sparsemv.at
+++ b/tests/sparsemv.at
@@ -29,6 +29,7 @@ AT_KEYWORDS([sparse multiv sparsemv])
 #
 
 AT_TAR_CHECK([
+exec <&-
 genfile --sparse --file sparsefile 0 ABCDEFGHIJ 1M ABCDEFGHI || AT_SKIP_TEST
 echo "Pass 1: Split between data blocks"
 echo "Create archive"
diff --git a/tests/sparsemvp.at b/tests/sparsemvp.at
index 5a97088..fda58c2 100644
--- a/tests/sparsemvp.at
+++ b/tests/sparsemvp.at
@@ -26,6 +26,7 @@ AT_KEYWORDS([sparse multiv sparsemvp])
 # See comment in sparsemv.at for the description.
 
 AT_TAR_CHECK([
+exec <&-
 genfile --sparse --file sparsefile 0 ABCDEFGHIJK 1M ABCDEFGHI || AT_SKIP_TEST
 echo "Pass 1: Split between data blocks"
 echo "Create archive"
diff --git a/tests/star/multi-fail.at b/tests/star/multi-fail.at
index 3833d98..f7faebd 100644
--- a/tests/star/multi-fail.at
+++ b/tests/star/multi-fail.at
@@ -28,7 +28,7 @@ AT_STAR_PREREQ([gnu-multi-fail-volume1.gtar])
 AT_STAR_PREREQ([gnu-multi-fail-volume2.gtar])
 
 tar --utc -tvM -f $STAR_TESTSCRIPTS/gnu-multi-fail-volume1.gtar \
-               -f $STAR_TESTSCRIPTS/gnu-multi-fail-volume2.gtar </dev/null
+               -f $STAR_TESTSCRIPTS/gnu-multi-fail-volume2.gtar <&-
 ],
 [0],
 [drwxrwsr-x joerg/bs          0 2003-10-11 14:32 OBJ/i386-sunos5-gcc/