Accomodate for the new testsuite logic

diff --git a/tests/delete03.sh b/tests/delete03.sh
index 5428845c97ea26ad7faab3aec99147e85bf6f12f..0683b719dab0ae09eb91cd50eb99bcaacb1c21a9 100755 (executable)
--- a/tests/delete03.sh
+++ b/tests/delete03.sh
@@ -19,8 +19,8 @@
 # 02111-1307, USA.
 
 . ./preset
+TAR_ARCHIVE_FORMATS="gnu oldgnu posix"
 . $srcdir/before 
-prereq gnu oldgnu posix
 
 set -e
 prefix=This_is_a_very_long_file_name_prefix_that_is_designed_to_cause_problems_with_file_names_that_run_into_a_limit_of_the_posix_tar_formatXX

diff --git a/tests/gzip.sh b/tests/gzip.sh
index 133f9e9920e80a7b3f9e6714f0fd104dc8c1796b..565afd65136856efe531ee889cfbf4b66d53be6e 100755 (executable)
--- a/tests/gzip.sh
+++ b/tests/gzip.sh
@@ -2,6 +2,7 @@
 # tar should detect that its gzip child failed.
 
 . ./preset
+TAR_ARCHIVE_FORMATS=auto
 . $srcdir/before
 
 tar xfvz /dev/null

diff --git a/tests/incremen.sh b/tests/incremen.sh
index 24868aaea09a499ea83fd0568901f117cf1b0945..fea59c83dc7e11b9b6241d214bbe5f0490cff216 100755 (executable)
--- a/tests/incremen.sh
+++ b/tests/incremen.sh
@@ -2,8 +2,8 @@
 # A directory older than the listed entry was skipped completely.
 
 . ./preset
+TAR_ARCHIVE_FORMATS="gnu oldgnu"
 . $srcdir/before
-prereq gnu oldgnu
 
 set -e
 mkdir structure

diff --git a/tests/listed01.sh b/tests/listed01.sh
index 5828f82050438f260b926c72b8318702ab45a0ee..8d16b5892fde371c8cced9762cdc4bc6c5429f42 100755 (executable)
--- a/tests/listed01.sh
+++ b/tests/listed01.sh
@@ -22,8 +22,8 @@
 # 02111-1307, USA.
 
 . ./preset
+TAR_ARCHIVE_FORMATS="gnu oldgnu" 
 . $srcdir/before
-prereq gnu oldgnu 
 
 mkdir directory
 dd if=/dev/zero of=directory/file1 bs=1024 count=10 2>/dev/null

diff --git a/tests/multiv01.sh b/tests/multiv01.sh
index 505127f8a42187d80f457b32462a43e8c9635483..9f3bf6c9a721a4148f28d5accd26bafd35ead001 100755 (executable)
--- a/tests/multiv01.sh
+++ b/tests/multiv01.sh
@@ -2,8 +2,8 @@
 # Test multivolume dumps from pipes.
 
 . ./preset
+TAR_ARCHIVE_FORMATS="gnu oldgnu"
 . $srcdir/before
-prereq gnu oldgnu
 
 # Fixme: should be configurable
 #  TRUSS=truss -o /tmp/tr

diff --git a/tests/old.sh b/tests/old.sh
index 63b74c7a5d88bda9f4fb8201fc905b20a0a50836..cb25fdfaa233e54520f4ab15da89d6e760eab255 100755 (executable)
--- a/tests/old.sh
+++ b/tests/old.sh
@@ -2,6 +2,7 @@
 # An old archive was not receiving directories.
 
 . ./preset
+TAR_ARCHIVE_FORMATS=auto
 . $srcdir/before
 
 set -e

diff --git a/tests/options.sh b/tests/options.sh
index daa5e232e42cb14c1102f91c27dc382e02bb14bf..118cd19945a010367636ec7c687f51941608f058 100755 (executable)
--- a/tests/options.sh
+++ b/tests/options.sh
@@ -2,6 +2,7 @@
 # Ensure that TAR_OPTIONS works in conjunction with old-style options.
 
 . ./preset
+TAR_ARCHIVE_FORMATS=auto
 . $srcdir/before
 
 set -e

diff --git a/tests/version.sh b/tests/version.sh
index 7229069948b936d42d0ce55087c89fa9b8b9f50f..ad15b94e8f3619abbb318fd6727e98cc3d399f30 100755 (executable)
--- a/tests/version.sh
+++ b/tests/version.sh
@@ -2,7 +2,6 @@
 # Check if the proper version is being tested.
 
 . ./preset
-PATH=../src:$PATH
 
 if test -n "`$PACKAGE --version | sed -n s/$PACKAGE.*$VERSION/OK/p`"; then
   banner="Regression testing for GNU $PACKAGE, version $VERSION"

diff --git a/tests/volume.sh b/tests/volume.sh
index 37021e0290b633bf3210304f6f052bf8f20aaf19..4aafc354638bb477d194b0f9e0d70945b0736afb 100755 (executable)
--- a/tests/volume.sh
+++ b/tests/volume.sh
@@ -2,9 +2,10 @@
 # Volume labels are checked on read by fnmatch.
 
 . ./preset
+TAR_ARCHIVE_FORMATS="gnu oldgnu"
 . $srcdir/before
 
-tar -cf archive -V label -T /dev/null --format=gnu || exit 1
+tar -cf archive -V label -T /dev/null || exit 1
 
 tar xfV archive label || exit 1
 tar xfV archive 'la?el' || exit 1