b=14286

i=grev
i=adilger
branch=b1_6

change rundbench script to use contents of DBENCH_LIB variable to
find the location of the dbench executable (like acceptance-small.sh does)
so that we use the same environment variables to specify the location
of the dbench executable in both acceptance-small.sh and rundbench
instead of using different environment variables to configure the
same thing in the two different scripts.

diff --git a/lustre/tests/rundbench b/lustre/tests/rundbench
index e2fc0bf..f31be70 100755 (executable)
--- a/lustre/tests/rundbench
+++ b/lustre/tests/rundbench
@@ -4,7 +4,8 @@ DIR=${DIR:-$MOUNT/`hostname`}
 #[ -e /proc/sys/lnet/debug ] && echo 0 > /proc/sys/lnet/debug 
 mkdir -p $DIR
 TGT=$DIR/client.txt
-SRC=${SRC:-/usr/share/dbench/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