X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Fmultiv01.sh;h=58678e9717f2fb363ec1c1e1f8c92b233557e057;hb=44283eb6cab1d0faf5e446b092f0d5c03ee50b69;hp=6801b911be9d16e39d4a1e37bb0e39aef00165e0;hpb=a86cdfa58b6dfc99401877d1f11ea385b2ff0b7b;p=chaz%2Ftar

diff --git a/tests/multiv01.sh b/tests/multiv01.sh
index 6801b91..58678e9 100755
--- a/tests/multiv01.sh
+++ b/tests/multiv01.sh
@@ -1,7 +1,26 @@
 #! /bin/sh
+# This file is part of GNU tar testsuite.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 # Test multivolume dumps from pipes.
 
 . ./preset
+TAR_ARCHIVE_FORMATS="gnu oldgnu"
 . $srcdir/before
 
 # Fixme: should be configurable
@@ -9,7 +28,7 @@
 #  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 \
@@ -19,13 +38,13 @@ for block in " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" \
   done
 done >file2
 
-tar -c --format=gnu --multi-volume --tape-length=10 \
+tar -c --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 if=t2-pipe.tar |
-PATH=$PATH ${TRUSS} tar --format=gnu -f t1-pipe.tar -f - \
+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 +53,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