Branch b1_8

b=19432
i=robert.read
i=grev

1) move MPIRUN and MPI_USER from ncli.sh to local.sh
2) remove MPIBIN
3) redirect the stderr of "which mpirun" to /dev/null

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 7b1f550..dea4a2d 100644 (file)
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -94,3 +94,6 @@ POWER_DOWN=${POWER_DOWN:-"powerman --off"}
 POWER_UP=${POWER_UP:-"powerman --on"}
 SLOW=${SLOW:-no}
 FAIL_ON_ERROR=${FAIL_ON_ERROR:-true}
+
+MPIRUN=$(which mpirun 2>/dev/null) || true
+MPI_USER=${MPI_USER:-mpiuser}

diff --git a/lustre/tests/cfg/ncli.sh b/lustre/tests/cfg/ncli.sh
index a3fff9f..2bd0618 100644 (file)
--- a/lustre/tests/cfg/ncli.sh
+++ b/lustre/tests/cfg/ncli.sh
@@ -11,11 +11,6 @@ init_clients_lists
 
 [ -n "$FUNCTIONS" ] && . $FUNCTIONS || true
 
-MPIBIN=${MPIBIN:-/testsuite/tests/`arch`/bin}
-export PATH=:$PATH:$MPIBIN
-MPIRUN=$(which mpirun) || true
-MPI_USER=${MPI_USER:-mpiuser}
-
 # for recovery scale tests
 # default boulder cluster iozone location
 export PATH=/opt/iozone/bin:$PATH