Fix testsuite and bootstrap. Implement -I.

[chaz/tar] / tests / testsuite.at

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 4bd941e2f2e2824dca168ab03234e98ef5a87017..a12477d97fb4519edd72371618458e613e9c9ea7 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,11 +1,11 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2004, 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,
@@ -21,6 +21,7 @@
 # We need a recent Autotest.
 m4_version_prereq([2.52g])
 
+m4_define([AT_TAR_CHECK_HOOK])
 m4_define([AT_TAR_CHECK],[
   AT_XFAIL_IF(test -f $[]XFAILFILE)
   m4_foreach([FMT],
@@ -33,9 +34,20 @@ export TEST_TAR_FORMAT
 TAR_OPTIONS="-H FMT"
 export TAR_OPTIONS
 rm -rf *
-$1)],$2,$3,$4,$5,$6)])
+$1)],$2,$3,$4,$5,$6)
+              AT_TAR_CHECK_HOOK])
 ])
 
+m4_define([AT_TAR_WITH_HOOK],[
+  m4_pushdef([AT_TAR_CHECK_HOOK],[$1])
+  $2
+  
+  m4_popdef([AT_TAR_CHECK_HOOK])])
+
+m4_define([TAR_IGNREC_HOOK],[
+  AT_CHECK([grep -v '^.*tar: Record size = ' stderr; exit 0])
+])
+  
 m4_define([RE_CHECK],[
 AT_DATA([$1.re],[$2])
 awk '{print NR " " $[]0}' $1 > $[]$.1
@@ -55,7 +67,7 @@ dnl match second argument, skip the test.
 
 m4_define([AT_TARBALL_PREREQ],[
 test -z "$[]TEST_DATA_DIR" && AT_SKIP_TEST
-tarball_prereq $1 $2 $[]TEST_DATA_DIR $[]TEST_DATA_URL || AT_SKIP_TEST]) 
+tarball_prereq $1 $2 $[]TEST_DATA_DIR $[]TEST_DATA_URL || AT_SKIP_TEST])
 
 dnl AT_TARBALL_PREREQ(tarball, md5sum) - Same for star testfiles
 m4_define([AT_STAR_PREREQ],[
@@ -84,8 +96,8 @@ test $result -eq 0 && AT_SKIP_TEST
 ])
 
 m4_define([AT_TAR_MKHIER],[
-mkinstalldirs $1 >/dev/null
-m4_if([$2],,,genfile --file [$1]/[$2])])
+install-sh -d $1 >/dev/null dnl
+m4_if([$2],,,&& genfile --file [$1]/[$2]) || AT_SKIP_TEST])
 
 m4_include([sparsemvp.at])
 
@@ -100,12 +112,18 @@ m4_include([pipe.at])
 m4_include([options.at])
 m4_include([options02.at])
 
+m4_include([T-empty.at])
+m4_include([T-null.at])
+
 m4_include([indexfile.at])
+m4_include([verbose.at])
 
 m4_include([append.at])
 m4_include([append01.at])
 m4_include([append02.at])
 
+m4_include([exclude.at])
+
 m4_include([delete01.at])
 m4_include([delete02.at])
 m4_include([delete03.at])
@@ -118,6 +136,7 @@ m4_include([extrac03.at])
 m4_include([extrac04.at])
 m4_include([extrac05.at])
 m4_include([extrac06.at])
+m4_include([extrac07.at])
 
 m4_include([gzip.at])
 
@@ -131,6 +150,8 @@ m4_include([incr04.at])
 m4_include([rename01.at])
 m4_include([rename02.at])
 m4_include([rename03.at])
+m4_include([rename04.at])
+m4_include([rename05.at])
 m4_include([chtype.at])
 
 m4_include([ignfail.at])
@@ -147,6 +168,8 @@ m4_include([multiv01.at])
 m4_include([multiv02.at])
 m4_include([multiv03.at])
 m4_include([multiv04.at])
+m4_include([multiv05.at])
+m4_include([multiv06.at])
 
 m4_include([old.at])
 
@@ -171,8 +194,11 @@ m4_include([volume.at])
 m4_include([volsize.at])
 
 m4_include([comprec.at])
+m4_include([shortfile.at])
+m4_include([shortupd.at])
 
 m4_include([truncate.at])
+m4_include([grow.at])
 
 m4_include([star/gtarfail.at])
 m4_include([star/gtarfail2.at])
@@ -183,4 +209,3 @@ m4_include([star/ustar-big-2g.at])
 m4_include([star/ustar-big-8g.at])
 
 m4_include([star/pax-big-10g.at])
-