X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftar;a=blobdiff_plain;f=tests%2Fmultiv01.at;h=a5dedf6052bfc5367923ac60437ee79e8323aeb2;hp=885a6c6d3139df37eb14891280eff29f487c3633;hb=45ccda119355a1087450039a250359c1d0de0d08;hpb=35cae74c4cae8e59c84e215c493e5a032dbe4e15

diff --git a/tests/multiv01.at b/tests/multiv01.at
index 885a6c6..a5dedf6 100644
--- a/tests/multiv01.at
+++ b/tests/multiv01.at
@@ -1,34 +1,36 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright 2004, 2006-2007, 2009, 2013-2014 Free Software Foundation,
+# Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# This file is part of GNU tar.
+
+# GNU tar 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.
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 
-# This program is distributed in the hope that it will be useful,
+# GNU tar 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test multivolume dumps from pipes.
 
 AT_SETUP([multivolume dumps from pipes])
-AT_KEYWORDS([multiv01])
+AT_KEYWORDS([multivolume multiv multiv01])
 
 # Fixme: should be configurable
 #  TRUSS=truss -o /tmp/tr
 #  TRUSS=strace
 
 AT_TAR_CHECK([
-genfile --length 7168 > file1
+exec <&-
+genfile --length 7168 --file file1
 
 for block in " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" \
               " 9" "10" "11" "12" "13" "14" "15" "16" ; do \
@@ -38,22 +40,25 @@ for block in " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" \
   done
 done >file2
 
-tar -c --multi-volume --tape-length=10 \
-  --listed-incremental=t.snar \
+if test $TEST_TAR_FORMAT = pax; then
+  TAPE_LENGTH=11
+else
+  TAPE_LENGTH=10
+fi
+
+tar -c --multi-volume --tape-length=$TAPE_LENGTH \
   -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
+      -C extract-dir-pipe -x --multi-volume --warning=no-timestamp \
+      --tape-length=$TAPE_LENGTH --read-full-records || exit 1
 
 cmp file1 extract-dir-pipe/file1
 cmp file2 extract-dir-pipe/file2
 ],
 [0],
-[],[],[],[],[gnu, oldgnu])
+[],[],[],[],[gnu, oldgnu, pax])
 
 AT_CLEANUP
-
-