specify dump tape for _require_tape.

do this for cleanup and make tape variable existence
testing simpler

diff --git a/022 b/022
index 6d2bd168292b37450b5412568e14860a07054272..2e2bff58b99c7e1f83745482b7f4c4ec3781d236 100755 (executable)
--- a/022
+++ b/022
@@ -55,7 +55,7 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 
-_require_tape
+_require_tape $TAPE_DEV
 _create_dumpdir_stress
 _erase_hard
 _do_dump_sub

diff --git a/023 b/023
index b75cd27ae3422df3ee7da2d393e98e893e8578b8..32c9e51c83e0d9f52156e0b8bbab70a6029786a1 100755 (executable)
--- a/023
+++ b/023
@@ -54,7 +54,7 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 
-_require_tape
+_require_tape $TAPE_DEV
 _create_dumpdir_fill
 _erase_hard
 _do_dump_sub

diff --git a/024 b/024
index 826b0147b3bd5e650aa9b8ffa829e2403880d7af..652749cec7df3f2ee8a26db30c647af12301962a 100755 (executable)
--- a/024
+++ b/024
@@ -53,7 +53,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 
-_require_tape
+_require_tape $TAPE_DEV
 _create_dumpdir_fill
 _erase_hard
 _do_dump

diff --git a/025 b/025
index 4ad29fc6753be67bb311dc90a8819701ae7be489..b912caa6511032ebee017c2c0c58a5dd5f9048c2 100755 (executable)
--- a/025
+++ b/025
@@ -53,7 +53,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 
-_require_tape
+_require_tape $TAPE_DEV
 _create_dumpdir_fill
 _erase_hard
 _do_dump_min

diff --git a/035 b/035
index 909e2ff10288d8196b1763bcaa262887f0b01f00..cc8c7f951d97e768811e8e07dbb34d3181df1c50 100755 (executable)
--- a/035
+++ b/035
@@ -53,7 +53,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 
-_require_tape
+_require_tape $TAPE_DEV
 _create_dumpdir_fill
 _erase_hard
 _do_dump -L $seq.1

diff --git a/043 b/043
index db8aae509fa01eef51211d74f99628b03b1f08ff..f8a9842392730a53a5af1f26721eec6fbf452d91 100755 (executable)
--- a/043
+++ b/043
@@ -55,7 +55,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 
-_require_tape
+_require_tape $TAPE_DEV 
 _create_dumpdir_fill
 _erase_hard
 _do_dump_sub

diff --git a/common.config b/common.config
index 8401872d2f34563b3f4fac66f578114b47284ee1..0554ba6c8920769997228ae5588c3b397c7072ce 100644 (file)
--- a/common.config
+++ b/common.config
@@ -88,6 +88,7 @@ in
        SCRATCH_LOGDEV=/dev/sda7
        TAPE_DEV=/dev/st0
        RMT_TAPE_DEV=fuzzy:/dev/st0
+       RMT_IRIXTAPE_DEV=snort:/dev/tape
        ;;
     bruce)
         TEST_DEV=/dev/sda10

diff --git a/common.dump b/common.dump
index e4c60fded31390db6c319f9a0e433a911dafa748..ea3136968283015931cca50dd21112bfa53c46ae 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -198,11 +198,7 @@ _set_variable()
 
 _require_tape()
 {
-    if [ $# -eq 0 ]; then
-       dumptape=$TAPE_DEV
-    else
-       dumptape=$1
-    fi
+    dumptape=$1
 
     if [ -z "$dumptape" ]; then
         echo "This test requires a dump tape - none was specified"