From fcbcef96ded49a924424149f5ca786fbf18a1a84 Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Mon, 20 Dec 2010 19:11:01 +0300 Subject: [PATCH] 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 == ""; --- lustre/tests/functions.sh | 2 +- lustre/tests/obdfilter-survey.sh | 2 +- lustre/tests/rundbench | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh index 0953391..63d3868 100644 --- a/lustre/tests/functions.sh +++ b/lustre/tests/functions.sh @@ -31,7 +31,7 @@ mpi_run () { local rc $LFS df -i - 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 7adc4b9..42187af8 100644 --- a/lustre/tests/obdfilter-survey.sh +++ b/lustre/tests/obdfilter-survey.sh @@ -72,7 +72,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 -- 1.8.3.1