From: Minh Diep <mdiep@whamcloud.com>
Date: Tue, 6 Dec 2011 05:27:54 +0000 (-0800)
Subject: LU-900 test: ncli.sh cause test failure
X-Git-Tag: 2.1.53~49
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=c1d549b4acd0fcd3fba60973b171de2c7676aba7

LU-900 test: ncli.sh cause test failure

When a variable such as SRUN=$(which srun) returns empty, it
causes the test the fail
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Change-Id: I8e5550a6c2e65dc7fbc51c6a6ef6e7e62260d88b
Reviewed-on: http://review.whamcloud.com/1801
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Wei Liu <sarah@whamcloud.com>
Reviewed-by: Yu Jian <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/cfg/ncli.sh b/lustre/tests/cfg/ncli.sh
index a5de17e..a8c2885 100644
--- a/lustre/tests/cfg/ncli.sh
+++ b/lustre/tests/cfg/ncli.sh
@@ -29,6 +29,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"}