X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fcfg%2Fncli.sh;h=59ee0096412edeb3a4b685adc69c6bbc011c0058;hp=2735b9ad1c0f4d767d2d9949db616dc974abdac4;hb=8ce48257490f20ec7f11929a42ab3891139a9d8c;hpb=fa1d4b1012e4d06afbc796a995ca7e4e7ef37191

diff --git a/lustre/tests/cfg/ncli.sh b/lustre/tests/cfg/ncli.sh
index 2735b9a..59ee009 100644
--- a/lustre/tests/cfg/ncli.sh
+++ b/lustre/tests/cfg/ncli.sh
@@ -1,17 +1,31 @@
 . $LUSTRE/tests/cfg/local.sh
 
-CLIENT1=${CLIENT1:-`hostname`}
+# For multiple clients testing, we need use the cfg/ncli.sh config file, and
+# only need specify the "RCLIENTS" variable. The "CLIENTS" and "CLIENTCOUNT"
+# variables are defined in init_clients_lists(), called from cfg/ncli.sh.
+CLIENT1=${CLIENT1:-$(hostname)}
 SINGLECLIENT=$CLIENT1
 RCLIENTS=${RCLIENTS:-""}
-CLIENTS=`comma_list $SINGLECLIENT $RCLIENTS`
-REMOTECLIENTS=($RCLIENTS)
-for ((i=0; $i<${#REMOTECLIENTS[@]}; i++)); do
-	varname=CLIENT$((i + 2))
-	eval $varname=${REMOTECLIENTS[i]}
-done
 
-CLIENTCOUNT=$((${#REMOTECLIENTS[@]} + 1))
+init_clients_lists
+
+[ -n "$RCLIENTS" -a "$PDSH" = "no_dsh" ] &&
+	error "tests for remote clients $RCLIENTS needs pdsh != do_dsh " || true
+
+[ -n "$FUNCTIONS" ] && . $FUNCTIONS || true
 
-[ -n "$RCLIENTS" -a "$PDSH" = "no_dsh" ] && \
-                error "tests for remote clients $RCLIENTS needs pdsh != do_dsh " || true
+# for recovery scale tests
+# default boulder cluster iozone location
+export PATH=/opt/iozone/bin:$PATH
+
+LOADS=${LOADS:-"dd tar dbench iozone"}
+for i in $LOADS; do
+	[ -f $LUSTRE/tests/run_${i}.sh ] || error "incorrect load: $i"
+done
+CLIENT_LOADS=($LOADS)
 
+# This is used when testing on SLURM environment.
+# Test will use srun when SRUN_PARTITION is set
+SRUN=${SRUN:-$(which srun 2>/dev/null || true)}
+SRUN_PARTITION=${SRUN_PARTITION:-""}
+SRUN_OPTIONS=${SRUN_OPTIONS:-"-W 1800 -l -O"}