Update

diff --git a/tests/multiv01.at b/tests/multiv01.at
index 1652df93f99723ac6b67c32d99b1a864ce1c7d7a..3e2053c92f46e826df9f92f235ca6e97a720c560 100644 (file)
--- a/tests/multiv01.at
+++ b/tests/multiv01.at
@@ -38,15 +38,21 @@ for block in " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" \
   done
 done >file2
 
   done
 done >file2
 

-tar -c --multi-volume --tape-length=10 \
+if test $TEST_TAR_FORMAT = pax; then
+  TAPE_LENGTH=11
+else
+  TAPE_LENGTH=10
+fi
+
+tar -c --multi-volume --tape-length=$TAPE_LENGTH \

   --listed-incremental=t.snar \
   -f t1-pipe.tar -f t2-pipe.tar ./file1 ./file2 || exit 1
 
 mkdir extract-dir-pipe
   --listed-incremental=t.snar \
   -f t1-pipe.tar -f t2-pipe.tar ./file1 ./file2 || exit 1
 
 mkdir extract-dir-pipe

-dd bs=4096 count=10 if=t2-pipe.tar 2>/dev/null |
+dd bs=4096 count=$TAPE_LENGTH if=t2-pipe.tar 2>/dev/null |

 PATH=$PATH ${TRUSS} tar -f t1-pipe.tar -f - \
       -C extract-dir-pipe -x --multi-volume \
 PATH=$PATH ${TRUSS} tar -f t1-pipe.tar -f - \
       -C extract-dir-pipe -x --multi-volume \

-      --tape-length=10 --read-full-records || exit 1
+      --tape-length=$TAPE_LENGTH --read-full-records || exit 1

 
 cmp file1 extract-dir-pipe/file1
 cmp file2 extract-dir-pipe/file2
 
 cmp file1 extract-dir-pipe/file1
 cmp file2 extract-dir-pipe/file2

diff --git a/tests/sparsemvp.at b/tests/sparsemvp.at
index c3d8e44f3248a24bfa692b845e244ba90f037648..5a9708803052d46e5451604b913f9885c56e31a4 100644 (file)
--- a/tests/sparsemvp.at
+++ b/tests/sparsemvp.at
@@ -29,20 +29,20 @@ AT_TAR_CHECK([
 genfile --sparse --file sparsefile 0 ABCDEFGHIJK 1M ABCDEFGHI || AT_SKIP_TEST
 echo "Pass 1: Split between data blocks"
 echo "Create archive"
 genfile --sparse --file sparsefile 0 ABCDEFGHIJK 1M ABCDEFGHI || AT_SKIP_TEST
 echo "Pass 1: Split between data blocks"
 echo "Create archive"

-tar --sparse -c --record-size=512 -M -L7 -f arc.1 -f arc.2  sparsefile
+tar --sparse -c --record-size=512 -M -L7 -f arc.1 -f arc.2 -f arc.3 sparsefile 

 echo "Test archive"
 echo "Test archive"

-tar -t -M -f arc.1 -f arc.2 
+tar -t -M -f arc.1 -f arc.2 -f arc.3

 echo "Compare archive"
 echo "Compare archive"

-tar -d -M -f arc.1 -f arc.2
+tar -d -M -f arc.1 -f arc.2 -f arc.3

 
 echo "Pass 2: Split within a data block"
 genfile --sparse --file sparsefile 0 ABCDEFGHIJKL 1M ABCDEFG || AT_SKIP_TEST
 echo "Create archive"
 
 echo "Pass 2: Split within a data block"
 genfile --sparse --file sparsefile 0 ABCDEFGHIJKL 1M ABCDEFG || AT_SKIP_TEST
 echo "Create archive"

-tar --sparse -c --record-size=512 -M -L7 -f arc.1 -f arc.2  sparsefile
+tar --sparse -c --record-size=512 -M -L7 -f arc.1 -f arc.2 -f arc.3 sparsefile 

 echo "Test archive"
 echo "Test archive"

-tar -t -M -f arc.1 -f arc.2 
+tar -t -M -f arc.1 -f arc.2 -f arc.3

 echo "Compare archive"
 echo "Compare archive"

-tar -d -M -f arc.1 -f arc.2
+tar -d -M -f arc.1 -f arc.2 -f arc.3

 ],
 [0],
 [Pass 1: Split between data blocks
 ],
 [0],
 [Pass 1: Split between data blocks

diff --git a/tests/star/multi-fail.at b/tests/star/multi-fail.at
index e8fb156cacf73eb8aad7184651536b4594e6c309..3833d98862037be568b7558b5bffec7a883be03c 100644 (file)
--- 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 \
 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
+               -f $STAR_TESTSCRIPTS/gnu-multi-fail-volume2.gtar </dev/null

 ],
 [0],
 [drwxrwsr-x joerg/bs          0 2003-10-11 14:32 OBJ/i386-sunos5-gcc/
 ],
 [0],
 [drwxrwsr-x joerg/bs          0 2003-10-11 14:32 OBJ/i386-sunos5-gcc/