Use prereq() instead of passing arguments to 'before'.

diff --git a/tests/delete03.sh b/tests/delete03.sh
index 76c4d5211eb3cd6a9df6815cf699a3e2e268a68f..5428845c97ea26ad7faab3aec99147e85bf6f12f 100755 (executable)
--- a/tests/delete03.sh
+++ b/tests/delete03.sh
@@ -19,7 +19,8 @@
 # 02111-1307, USA.
 
 . ./preset
-. $srcdir/before 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/incremen.sh b/tests/incremen.sh
index 3e6ef617e9a9e7a8a7719d96272ce490bf5e3cb0..24868aaea09a499ea83fd0568901f117cf1b0945 100755 (executable)
--- a/tests/incremen.sh
+++ b/tests/incremen.sh
@@ -2,7 +2,8 @@
 # A directory older than the listed entry was skipped completely.
 
 . ./preset
-. $srcdir/before gnu oldgnu
+. $srcdir/before
+prereq gnu oldgnu
 
 set -e
 mkdir structure

diff --git a/tests/listed01.sh b/tests/listed01.sh
index 054b2564cfa3cb1a4c5c0b42cb734260bd3a4e73..5828f82050438f260b926c72b8318702ab45a0ee 100755 (executable)
--- a/tests/listed01.sh
+++ b/tests/listed01.sh
@@ -22,7 +22,8 @@
 # 02111-1307, USA.
 
 . ./preset
-. $srcdir/before 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 3a59c50bc58d441b29a546cacee667d0eb09247b..505127f8a42187d80f457b32462a43e8c9635483 100755 (executable)
--- a/tests/multiv01.sh
+++ b/tests/multiv01.sh
@@ -2,14 +2,15 @@
 # Test multivolume dumps from pipes.
 
 . ./preset
-. $srcdir/before gnu oldgnu
+. $srcdir/before
+prereq gnu oldgnu
 
 # Fixme: should be configurable
 #  TRUSS=truss -o /tmp/tr
 #  TRUSS=strace
 set -e
 
-dd if=/dev/zero bs=1024 count=7 >file1
+dd if=/dev/zero bs=1024 count=7 2>/dev/null >file1
 
 for block in " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" \
               " 9" "10" "11" "12" "13" "14" "15" "16" ; do \
@@ -24,7 +25,7 @@ tar -c --multi-volume --tape-length=10 \
   -f t1-pipe.tar -f t2-pipe.tar ./file1 ./file2
 
 mkdir extract-dir-pipe
-dd bs=4096 count=10 if=t2-pipe.tar |
+dd bs=4096 count=10 if=t2-pipe.tar 2>/dev/null |
 PATH=$PATH ${TRUSS} tar -f t1-pipe.tar -f - \
       -C extract-dir-pipe -x --multi-volume \
       --tape-length=10 --read-full-records
@@ -34,11 +35,5 @@ cmp file2 extract-dir-pipe/file2
 
 out="\
 "
-err="\
-7+0 records in
-7+0 records out
-2+1 records in
-2+1 records out
-"
 
 . $srcdir/after