X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=332f74065d10773bf3d28eff1cd8196f9325cea1;hp=898cebed341f7bdea86acb0062b47f17bc622a27;hb=a98d44e0439ad5b20d0d7f273b29e6ea990312f0;hpb=33e35c0bf214c2565b8b0ce6b2235b9262aa1b54

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 898cebe..332f740 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -4683,34 +4683,35 @@ banner() {
 }
 
 #
-# Run a single test function and cleanup after it.  
+# Run a single test function and cleanup after it.
 #
 # This function should be run in a subshell so the test func can
 # exit() without stopping the whole script.
 #
 run_one() {
-    local testnum=$1
-    local message=$2
-    tfile=f.${TESTSUITE}.${testnum}
-    export tdir=d0.${TESTSUITE}/d${base}
-    export TESTNAME=test_$testnum
-    local SAVE_UMASK=`umask`
-    umask 0022
-
-    banner "test $testnum: $message"
-    test_${testnum} || error "test_$testnum failed with $?"
-    cd $SAVE_PWD
-    reset_fail_loc
-    check_grant ${testnum} || error "check_grant $testnum failed with $?"
-    check_catastrophe || error "LBUG/LASSERT detected"
+	local testnum=$1
+	local message=$2
+	export tfile=f${testnum}.${TESTSUITE}
+	export tdir=d${testnum}.${TESTSUITE}
+	export TESTNAME=test_$testnum
+	local SAVE_UMASK=`umask`
+	umask 0022
+
+	banner "test $testnum: $message"
+	test_${testnum} || error "test_$testnum failed with $?"
+	cd $SAVE_PWD
+	reset_fail_loc
+	check_grant ${testnum} || error "check_grant $testnum failed with $?"
+	check_catastrophe || error "LBUG/LASSERT detected"
 	if [ "$PARALLEL" != "yes" ]; then
 		ps auxww | grep -v grep | grep -q multiop &&
 					error "multiop still running"
 	fi
-    unset TESTNAME
-    unset tdir
-    umask $SAVE_UMASK
-    return 0
+	unset TESTNAME
+	unset tdir
+	unset tfile
+	umask $SAVE_UMASK
+	return 0
 }
 
 #