X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Fmultiv01.sh;h=58682cef7f79790fbdd524ecf7d71359ad776897;hb=0273b1ae0945ead45f96ae5b82700d793cd96639;hp=3a59c50bc58d441b29a546cacee667d0eb09247b;hpb=c48759586476fe0b57167a680b4cc7d3ce77ed5a;p=chaz%2Ftar

diff --git a/tests/multiv01.sh b/tests/multiv01.sh
index 3a59c50..58682ce 100755
--- a/tests/multiv01.sh
+++ b/tests/multiv01.sh
@@ -2,14 +2,15 @@
 # Test multivolume dumps from pipes.
 
 . ./preset
-. $srcdir/before gnu oldgnu
+TAR_ARCHIVE_FORMATS="gnu oldgnu"
+. $srcdir/before
 
 # Fixme: should be configurable
 #  TRUSS=truss -o /tmp/tr
 #  TRUSS=strace
 set -e
 
-dd if=/dev/zero bs=1024 count=7 >file1
+genfile --length 7168 > file1
 
 for block in " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" \
               " 9" "10" "11" "12" "13" "14" "15" "16" ; do \
@@ -24,7 +25,7 @@ tar -c --multi-volume --tape-length=10 \
   -f t1-pipe.tar -f t2-pipe.tar ./file1 ./file2
 
 mkdir extract-dir-pipe
-dd bs=4096 count=10 if=t2-pipe.tar |
+dd bs=4096 count=10 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
@@ -34,11 +35,5 @@ cmp file2 extract-dir-pipe/file2
 
 out="\
 "
-err="\
-7+0 records in
-7+0 records out
-2+1 records in
-2+1 records out
-"
 
 . $srcdir/after