X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Fmultiv03.at;h=786fff3cca409845100fbac7566e05d443dd8b5d;hb=3de5db2a1511a8fa2b17a933ccee70ae20fd588b;hp=ee761271751840842e130bdb2da1d12e26930db6;hpb=120e96c480fbfc5fa31fba0f59ba1a45953b838e;p=chaz%2Ftar

diff --git a/tests/multiv03.at b/tests/multiv03.at
index ee76127..786fff3 100644
--- a/tests/multiv03.at
+++ b/tests/multiv03.at
@@ -1,22 +1,22 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004,2005 Free Software Foundation, Inc.
+# Copyright 2004-2007, 2013 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Problem: GNU multivolume archives are not able to continue on members
 # with filenames longer than 100 characters. Versions of tar <= 1.14
@@ -24,9 +24,11 @@
 # headers.
 # References: <20040809214854.GB32706@suse.de>
 # http://lists.gnu.org/archive/html/bug-tar/2004-08/msg00012.html
+# <200604270859.47241.Juergen.Vollmer@informatik-vollmer.de>
+#
 
 AT_SETUP([MV archive & long filenames])
-AT_KEYWORDS([multiv03])
+AT_KEYWORDS([multivolume multiv multiv03])
 
 AT_TAR_CHECK([
 AFILE=`awk 'BEGIN { for (i = 0; i < 100; i++) printf "a"; exit; }'`
@@ -34,22 +36,31 @@ BFILE=`awk 'BEGIN { for (i = 0; i < 101; i++) printf "b"; exit; }'`
 
 cat > ../experr <<EOF
 tar: $BFILE: file name too long to be stored in a GNU multivolume header, truncated
+tar: '$BFILE' is possibly continued on this volume: header contains truncated name
 EOF
 
 cat > ../expout <<EOF
 $AFILE
-separator
+separator-1
+separator-2
 EOF
 
-genfile --length 15360 > $AFILE
+genfile --length 15360 --file $AFILE
+
+exec <&-
 
 tar -M -L 10 -c -f arch.1 -f arch.2 $AFILE || exit 1
 tar -tM -f arch.1 -f arch.2 || exit 1
 
-echo separator
+echo separator-1
 
-genfile --length 15360 > $BFILE
-tar -M -L 10 -c -f arch.1 -f arch.2 $BFILE 
+genfile --length 15360 --file $BFILE
+tar -M -L 10 -c -f arch.1 -f arch.2 $BFILE || exit 1
+
+echo separator-2
+mv $BFILE bfile
+tar -M -x -f arch.1 -f arch.2 --warning=no-timestamp || exit 1
+cmp $BFILE bfile
 ],
 [0],
 [expout],
@@ -57,4 +68,3 @@ tar -M -L 10 -c -f arch.1 -f arch.2 $BFILE
 [],[],[gnu, oldgnu])
 
 AT_CLEANUP
-