[ "$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
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}
}
test_1 () {
- local mdss=$(get_facets MDS)
+ 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; }
+ check_progs_installed $(facets_hosts $mdss) $SGPDDSURVEY sg_map ||
+ skip_env "SGPDDSURVEY=$SGPDDSURVEY or sg_map not found"
- run_sgpdd_facets $mdss
+ run_sgpdd_facets $mdss
}
run_test 1 "sgpdd-survey, mds, scsidevs"
test_2 () {
- local osts=$(get_facets OST)
+ 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; }
+ check_progs_installed $(facets_hosts $osts) $SGPDDSURVEY sg_map ||
+ skip_env "SGPDDSURVEY=$SGPDDSURVEY or sg_map not found"
- run_sgpdd_facets $osts
+ run_sgpdd_facets $osts
}
run_test 2 "sgpdd-survey, osts, scsidevs"
-equals_msg `basename $0`: test complete, cleaning up
-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
+complete $SECONDS
+exit_status