From: fsgqa <fsgqa>
Date: Fri, 2 Feb 2001 04:31:55 +0000 (+0000)
Subject: specify dump tape for _require_tape.
X-Git-Tag: v1.1.0~1319
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8d82c7241c2a1bf1655dbd65780c38529b32fa56;p=users%2Fhch%2Fxfstests-dev.git

specify dump tape for _require_tape.
do this for cleanup and make tape variable existence
testing simpler
---

diff --git a/022 b/022
index 6d2bd1682..2e2bff58b 100755
--- 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 b75cd27ae..32c9e51c8 100755
--- 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 826b0147b..652749cec 100755
--- 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 4ad29fc67..b912caa65 100755
--- 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 909e2ff10..cc8c7f951 100755
--- 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 db8aae509..f8a984239 100755
--- 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 8401872d2..0554ba6c8 100644
--- 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 e4c60fded..ea3136968 100644
--- 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"