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

diff --git a/lustre/tests/sgpdd-survey.sh b/lustre/tests/sgpdd-survey.sh
index 7268cd8..a83dbf0 100644
--- a/lustre/tests/sgpdd-survey.sh
+++ b/lustre/tests/sgpdd-survey.sh
@@ -16,9 +16,9 @@ size=${size:-1024}
 
 [ "$SLOW" = no ] && { crghi=2; thrhi=2; }
 
-if ! ([ "$SGPDD_YES" ] && [ "$REFORMAT" ]); then
-    skip_env "$0 reformats all devices, please set SGPDD_YES and REFORMAT to run this test"
-    exit 0
+if [ "$SGPDD_YES" != "yes" -o "$REFORMAT" != "yes" ]; then
+	skip_env "$0 reformats all devices, set SGPDD_YES=yes REFORMAT=yes"
+	exit 0
 fi
 
 # Skip these tests
@@ -46,13 +46,13 @@ run_sgpdd_facets () {
     for facet in ${facets//,/ }; do
         local host=$(facet_host $facet)
         local dev=${facet}_dev
-        local var=${host}_devs
+        local var=$(node_var_name ${host}_devs)
         eval ${var}=$(expand_list ${!var} ${!dev})
         facetshosts=$(expand_list $facetshosts $host)
     done
 
     for host in ${facetshosts//,/ }; do
-        var=${host}_devs
+        var=$(node_var_name ${host}_devs)
         echo "=== $facets === $host === ${!var} ==="
         local scsidevs=${!var}
         run_sgpdd_host $host ${scsidevs}
@@ -79,5 +79,5 @@ test_2 () {
 }
 run_test 2 "sgpdd-survey, osts, scsidevs"
 
-equals_msg `basename $0`: test complete, cleaning up
-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
+complete $SECONDS
+exit_status