X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Fmultiv03.at;h=27d0a28a7f5eb708d23a46c8eda9d4b0c5f6d5c2;hb=336519aa4f81415a34064d3342ce1d984be5f290;hp=3fbb857096f52902fb0fb285641be29f6ec9e59a;hpb=35cae74c4cae8e59c84e215c493e5a032dbe4e15;p=chaz%2Ftar

diff --git a/tests/multiv03.at b/tests/multiv03.at
index 3fbb857..27d0a28 100644
--- a/tests/multiv03.at
+++ b/tests/multiv03.at
@@ -1,11 +1,11 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -15,8 +15,8 @@
 
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # Problem: GNU multivolume archives are not able to continue on members
 # with filenames longer than 100 characters. Versions of tar <= 1.14
@@ -24,35 +24,45 @@
 # 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; }'`
 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
-tar: Error is not recoverable: exiting now
+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 --file $BFILE
+tar -M -L 10 -c -f arch.1 -f arch.2 $BFILE || exit 1
 
-genfile --length 15360 > $BFILE
-tar -M -L 10 -c -f arch.1 -f arch.2 $BFILE 
+echo separator-2
+mv $BFILE bfile
+tar -M -x -f arch.1 -f arch.2 || exit 1
+cmp $BFILE bfile
 ],
-[2],
+[0],
 [expout],
 [experr],
 [],[],[gnu, oldgnu])