X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Fsparsemvp.at;h=05073dd0e0ccfcdf9526393f2140df2f031e1d91;hb=3de5db2a1511a8fa2b17a933ccee70ae20fd588b;hp=c3d8e44f3248a24bfa692b845e244ba90f037648;hpb=5f060c20257471623a4c7edcceb64700387bbde6;p=chaz%2Ftar

diff --git a/tests/sparsemvp.at b/tests/sparsemvp.at
index c3d8e44..05073dd 100644
--- a/tests/sparsemvp.at
+++ b/tests/sparsemvp.at
@@ -1,48 +1,48 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright 2005-2009, 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.
-
-AT_SETUP([Sparse files in PAX MV archives])
-AT_KEYWORDS([sparse multiv sparsemvp])
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check if sparse files are correctly split between PAX multi-volume
 # archives.
 # See comment in sparsemv.at for the description.
 
+dnl TAR_MVP_TEST version map1 map2
+m4_define([TAR_MVP_TEST],[
 AT_TAR_CHECK([
-genfile --sparse --file sparsefile 0 ABCDEFGHIJK 1M ABCDEFGHI || AT_SKIP_TEST
+exec <&-
+genfile --sparse --file sparsefile $2 || AT_SKIP_TEST
 echo "Pass 1: Split between data blocks"
 echo "Create archive"
-tar --sparse -c --record-size=512 -M -L7 -f arc.1 -f arc.2  sparsefile
+tar --sparse --sparse-version=$1 -c --record-size=512 -M -L6 -f arc.1 -f arc.2 -f arc.3 sparsefile
 echo "Test archive"
-tar -t -M -f arc.1 -f arc.2 
+tar -t -M -f arc.1 -f arc.2 -f arc.3
 echo "Compare archive"
-tar -d -M -f arc.1 -f arc.2
+tar -d -M -f arc.1 -f arc.2 -f arc.3
 
 echo "Pass 2: Split within a data block"
-genfile --sparse --file sparsefile 0 ABCDEFGHIJKL 1M ABCDEFG || AT_SKIP_TEST
+genfile --sparse --file sparsefile $3 || AT_SKIP_TEST
 echo "Create archive"
-tar --sparse -c --record-size=512 -M -L7 -f arc.1 -f arc.2  sparsefile
+tar --sparse --sparse-version=$1 -c --record-size=512 -M -L6 -f arc.1 -f arc.2 -f arc.3 sparsefile
 echo "Test archive"
-tar -t -M -f arc.1 -f arc.2 
+tar -t -M -f arc.1 -f arc.2 -f arc.3
 echo "Compare archive"
-tar -d -M -f arc.1 -f arc.2
+tar -d -M -f arc.1 -f arc.2 -f arc.3
 ],
 [0],
 [Pass 1: Split between data blocks
@@ -56,6 +56,4 @@ Test archive
 sparsefile
 Compare archive
 ],
-[],[],[],[pax])
-
-AT_CLEANUP
+[],[],[],[pax])])