X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ftests%2Fsgpdd-survey.sh;h=d0df78862acbcf3ceb7d935bbc0730d31e10fab0;hb=edd1b078941b9cc97e39e0b54b9daabe0e6f2792;hp=a83dbf0d7ba2ed250b4082655badc4335c6d43e3;hpb=03eb7bb98d5d7f86b37cf4d3a8965ac71bd0693e;p=fs%2Flustre-release.git diff --git a/lustre/tests/sgpdd-survey.sh b/lustre/tests/sgpdd-survey.sh index a83dbf0..d0df788 100644 --- a/lustre/tests/sgpdd-survey.sh +++ b/lustre/tests/sgpdd-survey.sh @@ -60,22 +60,22 @@ run_sgpdd_facets () { } 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"