Branch HEAD

[fs/lustre-release.git] / lustre / tests / rundbench

diff --git a/lustre/tests/rundbench b/lustre/tests/rundbench
index 3c96233..40a8fde 100755 (executable)
--- a/lustre/tests/rundbench
+++ b/lustre/tests/rundbench
@@ -4,13 +4,17 @@ DIR=${DIR:-$MOUNT/`hostname`}
 #[ -e /proc/sys/lnet/debug ] && echo 0 > /proc/sys/lnet/debug 
 mkdir -p $DIR
 TGT=$DIR/client.txt
+DBENCH_LIB=${DBENCH_LIB:-/usr/share/dbench}
+SRC=${SRC:-$DBENCH_LIB/client.txt}
+[ ! -s $TGT -a -s $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
 SRC=${SRC:-/usr/lib/dbench/client.txt}
 [ ! -s $TGT -a -s $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
 SRC=/usr/lib/dbench/client_plain.txt
 [ ! -s $TGT -a -s $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
-SRC=/usr/share/dbench/client.txt
-[ ! -s $TGT -a -s $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
 [ ! -s $TGT ] && echo "$0: $TGT doesn't exist (SRC=$SRC)" && exit 1
 cd $DIR
 echo "running 'dbench $@' on $PWD at `date`"
 dbench -c client.txt $@
+RC=$?
+[ $RC -ne 0 ] && killall -9 dbench
+exit $RC