From 427f8d6185af347cfc782c2c197a3e181acdfd80 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Sun, 29 Feb 2004 00:07:00 +0000
Subject: [PATCH]  Accomodate for the new testsuite logic

---
 tests/delete03.sh | 2 +-
 tests/gzip.sh     | 1 +
 tests/incremen.sh | 2 +-
 tests/listed01.sh | 2 +-
 tests/multiv01.sh | 2 +-
 tests/old.sh      | 1 +
 tests/options.sh  | 1 +
 tests/version.sh  | 1 -
 tests/volume.sh   | 3 ++-
 9 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/delete03.sh b/tests/delete03.sh
index 5428845..0683b71 100755
--- 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 133f9e9..565afd6 100755
--- 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 24868aa..fea59c8 100755
--- 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 5828f82..8d16b58 100755
--- 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 505127f..9f3bf6c 100755
--- 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 63b74c7..cb25fdf 100755
--- 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 daa5e23..118cd19 100755
--- 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 7229069..ad15b94 100755
--- 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 37021e0..4aafc35 100755
--- 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
-- 
2.45.2