Add incr04.at

[chaz/tar] / tests / testsuite.at

diff --git a/tests/testsuite.at b/tests/testsuite.at
index fa327be19b4d841086537acff7c4aa4bf104ca5a..b3a9f3286bda4ae75cea590facd95048acfcac3e 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -22,6 +22,7 @@
 m4_version_prereq([2.52g])
 
 m4_define([AT_TAR_CHECK],[
+  AT_XFAIL_IF(test -f $[]XFAILFILE)
   m4_foreach([FMT],
              [m4_if([$7],[],[v7,oldgnu,ustar,posix,gnu],[$7])],
              [AT_CHECK([
@@ -47,18 +48,44 @@ done
 
 m4_define([AT_SKIP_TEST],[exit 77])
 
+dnl AT_TARBALL_PREREQ(tarball, md5sum) - Check if test tarball exists
+dnl in $TEST_DATA_DIR. If it does not, try to download it from
+dnl $TEST_DATA_URL. If download fails, or it the file's md5 sum does not
+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]) 
+
+dnl AT_TARBALL_PREREQ(tarball, md5sum) - Same for star testfiles
 m4_define([AT_STAR_PREREQ],[
 test -z "$STAR_TESTSCRIPTS" && AT_SKIP_TEST
-test -r "$STAR_TESTSCRIPTS/$1" || AT_SKIP_TEST
+tarball_prereq $1 $2 $[]STAR_TESTSCRIPTS $[]STAR_DATA_URL || AT_SKIP_TEST
 ])
 
+dnl AT_GZIP_PREREQ - Skip test unless gzip (or $1) is available
 m4_define([AT_GZIP_PREREQ],[
 cat /dev/null | m4_if([$1],[],gzip,[$1]) - > /dev/null 2>&1 || AT_SKIP_TEST
 ])
 
+dnl AT_SORT_PREREQ - Skip test if sort utility outputs unwanted data on stderr
+m4_define([AT_SORT_PREREQ],[
+test -z "`sort < /dev/null 2>&1`" || AT_SKIP_TEST
+])
+
+dnl AT_UNPRIVILEGED_PREREQ - Skip test if running at root privileges
+m4_define([AT_UNPRIVILEGED_PREREQ],[
+echo "test" > $[]$
+chmod 0 $[]$
+cat $[]$ > /dev/null 2>&1
+result=$?
+rm -f $[]$
+test $result -eq 0 && AT_SKIP_TEST
+])
+
 m4_define([AT_TAR_MKHIER],[
 mkinstalldirs $1 >/dev/null
-genfile --file $1/$2])
+m4_if([$2],,,genfile --file [$1]/[$2])])
 
 AT_INIT
 
@@ -95,9 +122,11 @@ m4_include([incr02.at])
 m4_include([listed01.at])
 m4_include([listed02.at])
 m4_include([incr03.at])
+m4_include([incr04.at])
 m4_include([rename01.at])
 m4_include([rename02.at])
 m4_include([rename03.at])
+m4_include([chtype.at])
 
 m4_include([ignfail.at])
 
@@ -132,6 +161,7 @@ m4_include([sparsemvp.at])
 m4_include([update.at])
 
 m4_include([volume.at])
+m4_include([volsize.at])
 
 m4_include([comprec.at])
 
@@ -146,3 +176,4 @@ m4_include([star/ustar-big-2g.at])
 m4_include([star/ustar-big-8g.at])
 
 m4_include([star/pax-big-10g.at])
+