b=12900

i=Adilger

export DIR2 tdir

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 6d30100..2223235 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -54,6 +54,7 @@ init_test_env() {
     export FSYTPE=${FSTYPE:-"ldiskfs"}
     export NAME=${NAME:-local}
     export LPROC=/proc/fs/lustre
+    export DIR2
 
     if [ "$ACCEPTOR_PORT" ]; then
         export PORT_OPT="--port $ACCEPTOR_PORT"
@@ -983,7 +984,7 @@ run_one() {
     testnum=$1
     message=$2
     tfile=f${testnum}
-    tdir=d${base}
+    export tdir=d${base}
 
     BEFORE=`date +%s`
     log "== test $testnum: $message ============ `date +%H:%M:%S` ($BEFORE)"
@@ -996,6 +997,7 @@ run_one() {
         error "LBUG/LASSERT detected"
     pass "($((`date +%s` - $BEFORE))s)"
     unset TESTNAME
+    unset tdir
     cd $SAVE_PWD
     $CLEANUP
 }