X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Fsparsemvp.at;h=2edd823320002bfb9b907a8f4cd7cb871ecf8edc;hb=5354888e400e0565e85ac29e4826c0f7840cab45;hp=fda58c26977f077de947b482eca9e47c41f640bd;hpb=c81a5e8bf5f028859e24b2231c9751bbd6b6fdc4;p=chaz%2Ftar

diff --git a/tests/sparsemvp.at b/tests/sparsemvp.at
index fda58c2..2edd823 100644
--- a/tests/sparsemvp.at
+++ b/tests/sparsemvp.at
@@ -1,11 +1,11 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008 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,
@@ -18,28 +18,27 @@
 # 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])
-
 # 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([
 exec <&-
-genfile --sparse --file sparsefile 0 ABCDEFGHIJK 1M ABCDEFGHI || AT_SKIP_TEST
+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 -f arc.3 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 -f arc.3
 echo "Compare archive"
 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 -f arc.3 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 -f arc.3
 echo "Compare archive"
@@ -57,6 +56,7 @@ Test archive
 sparsefile
 Compare archive
 ],
-[],[],[],[pax])
+[tar: Record size = 12 blocks
+tar: Record size = 12 blocks
+],[],[],[pax])])
 
-AT_CLEANUP