LU-1538 tests: standardize test script init - dne-part-2

[fs/lustre-release.git] / lustre / tests / mds-survey.sh

diff --git a/lustre/tests/mds-survey.sh b/lustre/tests/mds-survey.sh
index 5945711..3d1ca65 100644 (file)
--- a/lustre/tests/mds-survey.sh
+++ b/lustre/tests/mds-survey.sh
@@ -1,33 +1,29 @@
 #!/bin/bash
-#set -x
 set -e
 
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-file_count=${file_count:-150000}
-dir_count=${dir_count:-4}
-thrhi=${thrhi:-8}
-thrlo=${thrlo:-1}
+ALWAYS_EXCEPT="$MDS_SURVEY_EXCEPT "
 
-[ "$SLOW" = no ] && { file_count=50000; dir_count=2; thrhi=4; }
-
-# Skip these tests
-ALWAYS_EXCEPT="$MDS_SURVEY_EXCEPT"
+build_test_filter
 
 MDSSURVEY=${MDSSURVEY:-$(which mds-survey 2>/dev/null || true)}
-if [ -z ${MDSSURVEY} ]; then
-    skip_env "mds-survey not found" && exit
-fi
+[ -z ${MDSSURVEY} ] && skip_env "mds-survey not found"
 
 if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.51) ]; then
-       skip_env "Need MDS version at least 2.3.51" && exit
+       skip_env "Need MDS version at least 2.3.51"
 fi
 
-build_test_filter
+file_count=${file_count:-150000}
+dir_count=${dir_count:-4}
+thrhi=${thrhi:-8}
+thrlo=${thrlo:-1}
+
+[ "$SLOW" = no ] && { file_count=50000; dir_count=2; thrhi=4; }
+
 check_and_setup_lustre
 
 adjust_inode() {
@@ -121,13 +117,9 @@ run_test 1 "Metadata survey with zero-stripe"
 test_2() {
        local mdscount=$(get_node_count "$(mdts_nodes)")
 
-       if [ $mdscount -gt 1 ]; then
-               skip_env "Only run this test on single MDS" && return
-       fi
+       [ $mdscount -gt 1 ] && skip_env "Only run this test on single MDS"
+       [ $ost_count -eq 0 ] && skip_env "Need to mount OST to test"
 
-       if [ $ost_count -eq 0 ]; then
-               skip_env "Need to mount OST to test" && return
-       fi
        mds_survey_run "mdd" "1"
 }
 run_test 2 "Metadata survey with stripe_count = 1"