X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsgpdd-survey.sh;h=7268cd8aec415f1009d92b6209a1af128ae6112c;hb=1749c5e937fc5ccf66f6782769f87836d5a00181;hp=de84b44df5e2b2dbde94d92454db44a4668821a3;hpb=25ebb75bf9f53e24e65ebd1246e9af1218c51cdb;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sgpdd-survey.sh b/lustre/tests/sgpdd-survey.sh
index de84b44d..7268cd8 100644
--- a/lustre/tests/sgpdd-survey.sh
+++ b/lustre/tests/sgpdd-survey.sh
@@ -24,8 +24,6 @@ fi
 # Skip these tests
 ALWAYS_EXCEPT="$SGPDD_SURVEY_EXCEPT"
 
-SGPDDSURVEY=${SGPDDSURVEY:-$(which sgpdd-survey)}
-
 build_test_filter
 
 init_facets_vars
@@ -64,6 +62,9 @@ run_sgpdd_facets () {
 test_1 () {
     local mdss=$(get_facets MDS)
 
+    check_progs_installed $(facets_hosts $mdss) $SGPDDSURVEY sg_map || \
+        { skip_env "SGPDDSURVEY=$SGPDDSURVEY or sg_map not found" && return 0; }
+
     run_sgpdd_facets $mdss
 }
 run_test 1 "sgpdd-survey, mds, scsidevs"
@@ -71,6 +72,9 @@ run_test 1 "sgpdd-survey, mds, scsidevs"
 test_2 () {
     local osts=$(get_facets OST)
 
+    check_progs_installed $(facets_hosts $osts) $SGPDDSURVEY sg_map || \
+        { skip_env "SGPDDSURVEY=$SGPDDSURVEY or sg_map not found" && return 0; }
+
     run_sgpdd_facets $osts
 }
 run_test 2 "sgpdd-survey, osts, scsidevs"