(AT_SORT_PREREQ, AT_UNPRIVILEGED_PREREQ): New defines

[chaz/tar] / tests / testsuite.at

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 5459a47d2b834b6c6cd806b4d5b66aa94fd2e002..f425f3ccae6d46d5f43460661265986e2da88264 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,7 +1,7 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006 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
@@ -27,6 +27,8 @@ m4_define([AT_TAR_CHECK],[
              [AT_CHECK([
 mkdir FMT
 (cd FMT
+TEST_TAR_FORMAT=FMT
+export TEST_TAR_FORMAT
 TAR_OPTIONS="-H FMT"
 export TAR_OPTIONS
 rm -rf *
@@ -50,10 +52,30 @@ test -z "$STAR_TESTSCRIPTS" && AT_SKIP_TEST
 test -r "$STAR_TESTSCRIPTS/$1" || 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])
+
 AT_INIT
 
 AT_TESTED([tar])
@@ -79,20 +101,29 @@ m4_include([extrac02.at])
 m4_include([extrac03.at])
 m4_include([extrac04.at])
 m4_include([extrac05.at])
+m4_include([extrac06.at])
 
 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([rename01.at])
+m4_include([rename02.at])
+m4_include([rename03.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])
+m4_include([lustar02.at])
+m4_include([lustar03.at])
 
 m4_include([multiv01.at])
 m4_include([multiv02.at])
@@ -110,6 +141,9 @@ m4_include([shortrec.at])
 
 m4_include([sparse01.at])
 m4_include([sparse02.at])
+m4_include([sparse03.at])
+m4_include([sparsemv.at])
+m4_include([sparsemvp.at])
 
 m4_include([update.at])