Revert "b=22842 do not use bash variable to pass test setup state between sub-test"

This reverts commit 81fdcaed0df6041183240bd91f615e15baf9f087.

This causes a failure in test 101b.

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 747efc9..c2c83c3 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2377,10 +2377,12 @@ stop_writeback() {
 
 # ensure that all stripes have some grant before we test client-side cache
 setup_test42() {
+       [ "$SETUP_TEST42" ] && return
        for i in `seq -f $DIR/f42-%g 1 $OSTCOUNT`; do
                dd if=/dev/zero of=$i bs=4k count=1
                rm $i
        done
+       SETUP_TEST42=DONE
 }
 
 # Tests 42* verify that our behaviour is correct WRT caching, file closure,
@@ -4348,7 +4350,9 @@ test_101() {
 }
 run_test 101 "check read-ahead for random reads ================"
 
+export SETUP_TEST101=no
 setup_test101() {
+       [ "$SETUP_TEST101" = "yes" ] && return
        mkdir -p $DIR/$tdir
        STRIPE_SIZE=1048576
        STRIPE_COUNT=$OSTCOUNT
@@ -4359,12 +4363,15 @@ setup_test101() {
        $SETSTRIPE $DIR/$tfile -s $STRIPE_SIZE -i $STRIPE_OFFSET -c $OSTCOUNT
 
        dd if=/dev/zero of=$DIR/$tfile bs=1024k count=100 2> /dev/null
+       SETUP_TEST101=yes
 }
 
 cleanup_test101() {
+       [ "$SETUP_TEST101" = "yes" ] || return
        trap 0
        rm -rf $DIR/$tdir
-       rm -f $DIR/$tfile
+        rm -f $DIR/$tfile
+       SETUP_TEST101=no
 }
 
 calc_total() {
@@ -4412,6 +4419,7 @@ test_101b() {
                cancel_lru_locks osc
                ra_check_101 $BSIZE
        done
+       cleanup_test101
        true
 }
 run_test 101b "check stride-io mode read-ahead ================="
@@ -4461,7 +4469,9 @@ test_101d() {
 }
 run_test 101d "file read with and without read-ahead enabled  ================="
 
+export SETUP_TEST102=no
 setup_test102() {
+       [ "$SETUP_TEST102" = "yes" ] && return
        mkdir -p $DIR/$tdir
        chown $RUNAS_ID $DIR/$tdir
        STRIPE_SIZE=65536
@@ -4488,12 +4498,14 @@ setup_test102() {
 
        cd $DIR
        $1 $TAR cf $TMP/f102.tar $tdir --xattrs
+       SETUP_TEST102=yes
 }
 
 cleanup_test102() {
        trap 0
+       [ "$SETUP_TEST102" = "yes" ] || return 0
        rm -f $TMP/f102.tar
-       rm -rf $DIR/d0.sanity/d102
+       SETUP_TEST102=no
 }
 
 test_102a() {

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 7744307..cd290b0 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -142,7 +142,7 @@ init_test_env() {
         export PATH=$PATH:$LUSTRE/utils/gss
     fi
     if ! echo $PATH | grep -q $LUSTRE/tests; then
-        export PATH=$LUSTRE/tests:$PATH
+        export PATH=$PATH:$LUSTRE/tests
     fi
     export LST=${LST:-"$LUSTRE/../lnet/utils/lst"}
     [ ! -f "$LST" ] && export LST=$(which lst)