From: Elena Gryaznova <elena.gryaznova@oracle.com>
Date: Mon, 8 Nov 2010 16:09:06 +0000 (+0300)
Subject: b=23049 various t-f.sh patches
X-Git-Tag: 2.0.56.0~31
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=48c8cf8fe613327c8735fe61482039f210fcb443;p=fs%2Flustre-release.git

b=23049 various t-f.sh patches

o=Brian.Murrell
i=grev

rundbench is a bash script;
obdfilter-survey is a bash script;
don't su if MPI_USER == "";
---

diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh
index 4d9ea51..56529b6 100644
--- a/lustre/tests/functions.sh
+++ b/lustre/tests/functions.sh
@@ -174,7 +174,7 @@ mpi_run () {
     local mpilog=$TMP/mpi.log
     local rc
 
-    if [ "$MPI_USER" != root -a $mpirun ]; then
+    if [ -n "$MPI_USER" -a "$MPI_USER" != root -a -n "$mpirun" ]; then
         echo "+ chmod 0777 $MOUNT"
         chmod 0777 $MOUNT
         command="su $MPI_USER sh -c \"$command \""
diff --git a/lustre/tests/obdfilter-survey.sh b/lustre/tests/obdfilter-survey.sh
index ee2e930..4719517 100644
--- a/lustre/tests/obdfilter-survey.sh
+++ b/lustre/tests/obdfilter-survey.sh
@@ -73,7 +73,7 @@ obdflter_survey_run () {
 	rm -f ${TMP}/obdfilter_survey*
 
 	local targets=$(obdflter_survey_targets $case)
-	local cmd="NETTYPE=$NETTYPE thrlo=$thrlo nobjhi=$nobjhi thrhi=$thrhi size=$size case=$case rslt_loc=${TMP} targets=\"$targets\" sh $OBDSURVEY"
+	local cmd="NETTYPE=$NETTYPE thrlo=$thrlo nobjhi=$nobjhi thrhi=$thrhi size=$size case=$case rslt_loc=${TMP} targets=\"$targets\" $OBDSURVEY"
 	echo + $cmd
 	eval $cmd
 
diff --git a/lustre/tests/rundbench b/lustre/tests/rundbench
index ad938da..ab9f236 100755
--- a/lustre/tests/rundbench
+++ b/lustre/tests/rundbench
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
 . $LUSTRE/tests/test-framework.sh