X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=70435d65c237cbdd409eaa9334fa0159408293dc;hp=d3a27c99a21408c0b03e45b0544f493e8ec1bef0;hb=6fcbb85b3a9a618e8dd7ee14c9fc7da7d23dab5d;hpb=39ec227275d9656775b14bc189eec3f6f1595833 diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index d3a27c9..70435d6 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -672,20 +672,23 @@ mount_facets () { } mount_facet() { - local facet=$1 - shift - local dev=$(facet_active $facet)_dev - local opt=${facet}_opt - local mntpt=$(facet_mntpt $facet) - - echo "Starting ${facet}: ${!opt} $@ ${!dev} $mntpt" - do_facet ${facet} "mkdir -p $mntpt; mount -t lustre ${!opt} $@ ${!dev} $mntpt" - RC=${PIPESTATUS[0]} - # to allow testing LU-482 error handling in mount_facets() and test_0a() - [ -f $TMP/test-lu482-trigger ] && RC=2 - if [ $RC -ne 0 ]; then - echo "mount -t lustre $@ ${!dev} $mntpt" - echo "Start of ${!dev} on ${facet} failed ${RC}" + local facet=$1 + shift + local dev=$(facet_active $facet)_dev + local opt=${facet}_opt + local mntpt=$(facet_mntpt $facet) + + echo "Starting ${facet}: ${!opt} $@ ${!dev} $mntpt" + # for testing LU-482 error handling in mount_facets() and test_0a() + if [ -f $TMP/test-lu482-trigger ]; then + RC=2 + else + do_facet ${facet} "mkdir -p $mntpt; mount -t lustre ${!opt} \ + $@ ${!dev} $mntpt" + RC=${PIPESTATUS[0]} + fi + if [ $RC -ne 0 ]; then + echo "Start of ${!dev} on ${facet} failed ${RC}" else set_default_debug_facet $facet