X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Ftestsuite.at;h=ed7bf1d20786992c4a47ea17b9f88519b019faa1;hb=ac40b1e6f6d0760ed656f7706c326de4ee68e149;hp=b1f3804f2e9d46e427f376a23edb11a0d8855768;hpb=a46e6aa4dcc22b5d8414a2cff89b8a787a546086;p=chaz%2Ftar

diff --git a/tests/testsuite.at b/tests/testsuite.at
index b1f3804..ed7bf1d 100644
--- 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,46 @@ 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])])
+
+m4_include([sparsemvp.at])
 
 AT_INIT
 
@@ -92,14 +121,19 @@ m4_include([gzip.at])
 m4_include([incremental.at])
 m4_include([incr01.at])
 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])
 
 m4_include([link01.at])
 
-m4_include([listed01.at])
-m4_include([listed02.at])
-
 m4_include([longv7.at])
 m4_include([long01.at])
 m4_include([lustar01.at])
@@ -124,11 +158,14 @@ m4_include([sparse01.at])
 m4_include([sparse02.at])
 m4_include([sparse03.at])
 m4_include([sparsemv.at])
-m4_include([sparsemvp.at])
+m4_include([spmvp00.at])
+m4_include([spmvp01.at])
+m4_include([spmvp10.at])
 
 m4_include([update.at])
 
 m4_include([volume.at])
+m4_include([volsize.at])
 
 m4_include([comprec.at])
 
@@ -143,3 +180,4 @@ m4_include([star/ustar-big-2g.at])
 m4_include([star/ustar-big-8g.at])
 
 m4_include([star/pax-big-10g.at])
+