LU-690 test: wait_osc_import_state() fixes

[fs/lustre-release.git] / lustre / tests / parallel-scale.sh

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index bc208a6..9fb568f 100644 (file)
--- a/lustre/tests/parallel-scale.sh
+++ b/lustre/tests/parallel-scale.sh
@@ -596,12 +596,12 @@ test_statahead () {
 
     local num_mntpts=$statahead_NUMMNTPTS
     local mntpt_root=$TMP/mntpt/lustre
-    mntopts=${MNTOPTSTATAHEAD:-$MOUNTOPT}
+    local mntopts=${MNTOPTSTATAHEAD:-$MOUNTOPT}
 
     echo "Mounting $num_mntpts lustre clients starts on $clients"
     trap "cleanup_statahead $clients $mntpt_root $num_mntpts" EXIT ERR
     for i in $(seq 0 $num_mntpts); do
-        zconf_mount_clients $clients ${mntpt_root}$i $mntopts ||
+        zconf_mount_clients $clients ${mntpt_root}$i "$mntopts" ||
             error_exit "Failed to mount lustre on ${mntpt_root}$i on $clients"
     done
 
@@ -620,6 +620,6 @@ test_statahead () {
 
 run_test statahead "statahead test, multiple clients"
 
-equals_msg `basename $0`: test complete, cleaning up
+complete $(basename $0) $SECONDS
 check_and_cleanup_lustre
-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true
+exit_status