LU-164 test: Update testframework to restart sessions at next suite

[fs/lustre-release.git] / lustre / tests / cfg / ncli.sh

diff --git a/lustre/tests/cfg/ncli.sh b/lustre/tests/cfg/ncli.sh
index a5de17e..d9afd5d 100644 (file)
--- a/lustre/tests/cfg/ncli.sh
+++ b/lustre/tests/cfg/ncli.sh
@@ -15,11 +15,6 @@ 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 ] || \
@@ -29,6 +24,6 @@ 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)}
+SRUN=${SRUN:-$(which srun 2>/dev/null || true)}
 SRUN_PARTITION=${SRUN_PARTITION:-""}
 SRUN_OPTIONS=${SRUN_OPTIONS:-"-W 1800 -l -O"}