b=17477

i=Adilger
replace cleanup_and_setup_lustre fn by check_and_setup_lustre fn

diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh
index 2704a3e..61a18f6 100755 (executable)
--- a/lustre/tests/insanity.sh
+++ b/lustre/tests/insanity.sh
@@ -162,7 +162,7 @@ clients_recover_osts() {
 #    do_node $CLIENTS "$LCTL "'--device %OSC_`hostname`_'"${facet}_svc_MNT_client_facet recover"
 }
 
 #    do_node $CLIENTS "$LCTL "'--device %OSC_`hostname`_'"${facet}_svc_MNT_client_facet recover"
 }
 

-cleanup_and_setup_lustre
+check_and_setup_lustre

 
 # 9 Different Failure Modes Combinations
 echo "Starting Test 17 at `date`"
 
 # 9 Different Failure Modes Combinations
 echo "Starting Test 17 at `date`"

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index c02fd18..35193eb 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -31,7 +31,7 @@ build_test_filter
 SETUP=${SETUP:-""}
 CLEANUP=${CLEANUP:-""}
 
 SETUP=${SETUP:-""}
 CLEANUP=${CLEANUP:-""}
 

-cleanup_and_setup_lustre
+check_and_setup_lustre

 
 assert_DIR
 rm -rf $DIR/[df][0-9]*
 
 assert_DIR
 rm -rf $DIR/[df][0-9]*

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 3f764c2..8806f2a 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -30,7 +30,7 @@ remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
 
 build_test_filter
 
 
 build_test_filter
 

-cleanup_and_setup_lustre
+check_and_setup_lustre

 assert_DIR
 rm -rf $DIR/[df][0-9]*
 
 assert_DIR
 rm -rf $DIR/[df][0-9]*
 

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index c3a2fd0..113ba91 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -34,7 +34,7 @@ fi
 
 build_test_filter
 
 
 build_test_filter
 

-cleanup_and_setup_lustre
+check_and_setup_lustre

 
 mkdir -p $DIR
 
 
 mkdir -p $DIR
 

diff --git a/lustre/tests/sanity-gss.sh b/lustre/tests/sanity-gss.sh
index a6c8166..62c7017 100644 (file)
--- a/lustre/tests/sanity-gss.sh
+++ b/lustre/tests/sanity-gss.sh
@@ -81,7 +81,7 @@ prepare_krb5_creds
 
 # we want double mount
 MOUNT_2=${MOUNT_2:-"yes"}
 
 # we want double mount
 MOUNT_2=${MOUNT_2:-"yes"}

-cleanup_and_setup_lustre
+check_and_setup_lustre

 
 rm -rf $DIR/[df][0-9]*
 
 
 rm -rf $DIR/[df][0-9]*
 

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 6298d3d..cb3dc82 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -61,7 +61,7 @@ QUOTALOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
 DIR=${DIR:-$MOUNT}
 DIR2=${DIR2:-$MOUNT2}
 
 DIR=${DIR:-$MOUNT}
 DIR2=${DIR2:-$MOUNT2}
 

-cleanup_and_setup_lustre
+check_and_setup_lustre

 
 LOVNAME=`cat $LPROC/llite/*/lov/common_name | tail -n 1`
 OSTCOUNT=`cat $LPROC/lov/$LOVNAME/numobd`
 
 LOVNAME=`cat $LPROC/llite/*/lov/common_name | tail -n 1`
 OSTCOUNT=`cat $LPROC/lov/$LOVNAME/numobd`