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

diff --git a/tests/multiv01.sh b/tests/multiv01.sh
index 3226f09..e68a459 100755
--- a/tests/multiv01.sh
+++ b/tests/multiv01.sh
@@ -4,6 +4,9 @@
 . ./preset
 . $srcdir/before
 
+# Fixme: should be configurable
+#  TRUSS=truss -o /tmp/tr
+#  TRUSS=strace
 set -e
 
 dd if=/dev/zero bs=1024 count=7 >file1
@@ -16,14 +19,15 @@ for block in " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" \
   done
 done >file2
 
-tar -c --multi-volume --tape-length=10 \
+tar -c --format=gnu --multi-volume --tape-length=10 \
   --listed-incremental=t.snar \
   -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 |
+PATH=$PATH ${TRUSS} tar --format=gnu -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
@@ -33,6 +37,9 @@ out="\
 err="\
 7+0 records in
 7+0 records out
+tar: Removing leading \`./' from member names
+2+1 records in
+2+1 records out
 "
 
 . $srcdir/after