X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftestsuite.at;h=b3a9f3286bda4ae75cea590facd95048acfcac3e;hb=bb6f7077810acdfc483400a784dcae233a3fc159;hp=f425f3ccae6d46d5f43460661265986e2da88264;hpb=ac7f4e853def7f7cb2b4c859d814d964228a5d20;p=chaz%2Ftar

diff --git a/tests/testsuite.at b/tests/testsuite.at
index f425f3c..b3a9f32 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,9 +48,19 @@ 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
@@ -74,7 +85,7 @@ 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
 
@@ -111,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])
 
@@ -148,6 +161,7 @@ m4_include([sparsemvp.at])
 m4_include([update.at])
 
 m4_include([volume.at])
+m4_include([volsize.at])
 
 m4_include([comprec.at])
 
@@ -162,3 +176,4 @@ m4_include([star/ustar-big-2g.at])
 m4_include([star/ustar-big-8g.at])
 
 m4_include([star/pax-big-10g.at])
+