LU-1538 tests: standardize test script init dne-part-1

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

diff --git a/lustre/tests/large-scale.sh b/lustre/tests/large-scale.sh
index 195f93b..9fd35a7 100644 (file)
--- a/lustre/tests/large-scale.sh
+++ b/lustre/tests/large-scale.sh
@@ -19,13 +19,12 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-remote_mds_nodsh && log "SKIP: remote MDS with nodsh" && exit 0
+remote_mds_nodsh && skip "remote MDS with nodsh"
 
-[ -z "$CLIENTS" ] && skip_env "$TESTSUITE: Need two or more clients" && exit 0
+[ -z "$CLIENTS" ] && skip_env "$TESTSUITE: Need two or more clients"
 [ $CLIENTCOUNT -lt 2 ] &&
-       skip_env "$TESTSUITE: Need 2+ clients, have only $CLIENTCOUNT" && exit 0
+       skip_env "$TESTSUITE: Need 2+ clients, have only $CLIENTCOUNT"
 
-#
 [ "$SLOW" = "no" ] && EXCEPT_SLOW=""
 
 MOUNT_2=""
@@ -83,8 +82,8 @@ test_3a() {
 
                        COMMAND="${MDSRATE} --create --nfiles $nfiles --dir
                                 $dir --filefmt 'f%%d'"
-                       mpi_run -np $((num * nthreads)) ${MACHINEFILE_OPTION} \
-                               $machinefile ${COMMAND} | tee ${LOG} &
+                       mpi_run ${MACHINEFILE_OPTION} $machinefile \
+                               -np $((num * nthreads)) ${COMMAND} | tee ${LOG}&
 
                        pid=$!
                        echo "pid=$pid"