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

diff --git a/lustre/tests/cfg/ncli.sh b/lustre/tests/cfg/ncli.sh
index 5e97660..59ee009 100644
--- a/lustre/tests/cfg/ncli.sh
+++ b/lustre/tests/cfg/ncli.sh
@@ -1,13 +1,16 @@
 . $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:-""}
 
 init_clients_lists
 
-[ -n "$RCLIENTS" -a "$PDSH" = "no_dsh" ] && \
-                error "tests for remote clients $RCLIENTS needs pdsh != do_dsh " || true
+[ -n "$RCLIENTS" -a "$PDSH" = "no_dsh" ] &&
+	error "tests for remote clients $RCLIENTS needs pdsh != do_dsh " || true
 
 [ -n "$FUNCTIONS" ] && . $FUNCTIONS || true
 
@@ -15,14 +18,14 @@ init_clients_lists
 # default boulder cluster iozone location
 export PATH=/opt/iozone/bin:$PATH
 
-# This is used by a small number of tests to share state between the client
-# running the tests, or in some cases between the servers (e.g. lfsck.sh).
-# It needs to be a non-lustre filesystem that is available on all the nodes.
-SHARED_DIRECTORY=${SHARED_DIRECTORY:-""}	# bug 17839 comment 65
-
 LOADS=${LOADS:-"dd tar dbench iozone"}
 for i in $LOADS; do
-    [ -f $LUSTRE/tests/run_${i}.sh ] || \
-        error "incorrect load: $i"
+	[ -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"}