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

diff --git a/tests/multiv01.sh b/tests/multiv01.sh
index 3226f09..58682ce 100755
--- a/tests/multiv01.sh
+++ b/tests/multiv01.sh
@@ -2,11 +2,15 @@
 # Test multivolume dumps from pipes.
 
 . ./preset
+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 \
@@ -21,18 +25,15 @@ 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 <t2-pipe.tar |
-PATH=$PATH truss -o /tmp/tr tar -f t1-pipe.tar -f - -C extract-dir-pipe -x --multi-volume \
-  --tape-length=10 --read-full-records
+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
 
 cmp file1 extract-dir-pipe/file1
 cmp file2 extract-dir-pipe/file2
 
 out="\
 "
-err="\
-7+0 records in
-7+0 records out
-"
 
 . $srcdir/after