Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-15412 tests: Let init_clients_lists() export client vars
[fs/lustre-release.git]
/
lustre
/
tests
/
cfg
/
ncli.sh
diff --git
a/lustre/tests/cfg/ncli.sh
b/lustre/tests/cfg/ncli.sh
index
d9afd5d
..
23c26a2
100644
(file)
--- a/
lustre/tests/cfg/ncli.sh
+++ b/
lustre/tests/cfg/ncli.sh
@@
-1,13
+1,14
@@
. $LUSTRE/tests/cfg/local.sh
. $LUSTRE/tests/cfg/local.sh
-CLIENT1=${CLIENT1:-`hostname`}
-SINGLECLIENT=$CLIENT1
+# 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.
RCLIENTS=${RCLIENTS:-""}
init_clients_lists
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
[ -n "$FUNCTIONS" ] && . $FUNCTIONS || true
@@
-17,8
+18,7
@@
export PATH=/opt/iozone/bin:$PATH
LOADS=${LOADS:-"dd tar dbench iozone"}
for i in $LOADS; do
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)
done
CLIENT_LOADS=($LOADS)