X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmds-survey.sh;h=e95452d03e973658c0193532f4b58829851c2149;hb=75c0eb51332639a09c720fb41f3a2cdb5b029afb;hp=5945711e3692a25e7a4817e3c2bbc1cb81b8045e;hpb=069f593572509d6ee285ba6ea8950101ccb62d72;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mds-survey.sh b/lustre/tests/mds-survey.sh
index 5945711..e95452d 100644
--- a/lustre/tests/mds-survey.sh
+++ b/lustre/tests/mds-survey.sh
@@ -19,12 +19,10 @@ thrlo=${thrlo:-1}
 ALWAYS_EXCEPT="$MDS_SURVEY_EXCEPT"
 
 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
@@ -121,13 +119,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"