[PATCH 25/25] xfstests: use _notrun for tape checks

Dave Chinner david at fromorbit.com
Fri Mar 15 07:28:09 CDT 2013


From: Dave Chinner <dchinner at redhat.com>

_require_tape is failing tests when no TAPE_DEV is specified. It
should be using _notrun for these cases rather than trying to open
code the $seqres.notrun magic file manipulations.

Signed-off-by: Dave Chinner <dchinner at redhat.com>
---
 common/dump |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/common/dump b/common/dump
index 3df6191..5d4d2ae 100644
--- a/common/dump
+++ b/common/dump
@@ -139,9 +139,7 @@ _check_onl()
 	echo "ERROR: mt -f $dumptape failed"
 	cat $tmp.status
 
-	echo "mt -f $dumptape failed" >$seq.notrun
-	status=$NOTRUNSTS
-	exit
+	_notrun "mt -f $dumptape failed"
     fi
 
 
@@ -151,9 +149,7 @@ _check_onl()
 	echo "ERROR: $dumptape is not online"
 	cat $tmp.status
 
-	echo "dumptape, $dumptape, is not online" >$seq.notrun
-	status=$NOTRUNSTS
-	exit
+	_notrun "dumptape, $dumptape, is not online"
     fi
 }
 
@@ -229,10 +225,7 @@ _require_tape()
     dumptape=$1
 
     if [ -z "$dumptape" -o "@" == "$dumptape" ]; then
-        echo "This test requires a dump tape - none was specified"
-	echo "No dump tape specified" >$seqres.notrun
-	status=$NOTRUNSTS
-	exit
+	_notrun "No dump tape specified"
     fi
 
     _check_onl
-- 
1.7.10.4



More information about the xfs mailing list