From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Fri, 11 Nov 2005 00:26:39 +0000 (+0000)
Subject: Update
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=7e51be5fe2f1c8c567144e3d27801f3f665f525a;hp=05ba292a938a6450cc0a4e1dbf778159de2f5868;p=chaz%2Ftar

Update
---

diff --git a/tests/multiv01.at b/tests/multiv01.at
index 1652df9..3e2053c 100644
--- 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
 
-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
-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 \
-      --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
diff --git a/tests/sparsemvp.at b/tests/sparsemvp.at
index c3d8e44..5a97088 100644
--- 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"
-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"
-tar -t -M -f arc.1 -f arc.2 
+tar -t -M -f arc.1 -f arc.2 -f arc.3
 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"
-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"
-tar -t -M -f arc.1 -f arc.2 
+tar -t -M -f arc.1 -f arc.2 -f arc.3
 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
diff --git a/tests/star/multi-fail.at b/tests/star/multi-fail.at
index e8fb156..3833d98 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
+               -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/