Преглед изворни кода

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

Sergey Poznyakoff пре 19 година
родитељ
комит
c81a5e8bf5
7 измењених фајлова са 10 додато и 1 уклоњено
  1. 1 0
      tests/multiv01.at
  2. 2 0
      tests/multiv02.at
  3. 2 0
      tests/multiv03.at
  4. 2 0
      tests/multiv04.at
  5. 1 0
      tests/sparsemv.at
  6. 1 0
      tests/sparsemvp.at
  7. 1 1
      tests/star/multi-fail.at

+ 1 - 0
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" \

+ 2 - 0
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

+ 2 - 0
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
 

+ 2 - 0
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

+ 1 - 0
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"

+ 1 - 0
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"

+ 1 - 1
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/