From fc87bfee6eb0290141f5d13cfdca723d4099a4fe Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Tue, 23 Dec 2008 23:08:15 +0000
Subject: [PATCH] b=17839 i=Brian remote rundbench run fix

---
 lustre/tests/replay-single.sh | 5 ++++-
 lustre/tests/rundbench        | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index f9a5f65..5573475 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -1715,7 +1715,10 @@ test_70b () {
 	[ "$SLOW" = "no" ] && duration=60
 	local cmd="rundbench 1 -t $duration"
 	local PID=""
-	do_nodes $CLIENTS "set -x; PATH=:$PATH:$LUSTRE/utils:$LUSTRE/tests/:$DBENCH_LIB DBENCH_LIB=$DBENCH_LIB $cmd" &
+	do_nodes $CLIENTS "set -x; MISSING_DBENCH_OK=$MISSING_DBENCH_OK \
+		PATH=:$PATH:$LUSTRE/utils:$LUSTRE/tests/:$DBENCH_LIB \
+		DBENCH_LIB=$DBENCH_LIB TESTSUITE=$TESTSUITE TESTNAME=$TESTNAME \
+		LCTL=$LCTL $cmd" &
 	PID=$!
 	log "Started rundbench load PID=$PID ..."
 
diff --git a/lustre/tests/rundbench b/lustre/tests/rundbench
index c3fa9cb..57651f5 100755
--- a/lustre/tests/rundbench
+++ b/lustre/tests/rundbench
@@ -28,8 +28,8 @@ TGT=$DIR/client.txt
 CLIENT_PREFIX="${DBENCH_LIB} /usr/share/dbench /usr/local/share /usr/lib/dbench"
 CLIENT_FILE="client.txt client_plain.txt dbench_client"
 if ! which dbench > /dev/null 2>&1 ; then
-    [ "$MISSING_DBENCH_OK" ] || { error "dbench is not installed !" && exit 3; }
-    skip "$0: dbench is not installed"
+    [ "$MISSING_DBENCH_OK" ] || { error "$0 : $(hostname) dbench is not installed !" && exit 3; }
+    skip "$0 : $(hostname) dbench is not installed"
     exit 0
 fi
 CLIENT=""
@@ -49,12 +49,12 @@ if [ -n "$SRC" -a -s "$SRC" ]; then
 fi
 
 [ ! -s "$CLIENT" ] && \
-    skip "$0: no client file found for dbench DBENCH_LIB=$DBENCH_LIB SRC=$SRC" && \
+    skip "$0 : $(hostname) no client file found for dbench DBENCH_LIB=$DBENCH_LIB SRC=$SRC" && \
         exit 0 
 
 [ ! -s "$TGT" ] && echo "copying $CLIENT to $TGT" && cp $CLIENT $TGT
 [ ! -s "$TGT" ] && \
-    echo "$0: $TGT file doesn't exist after cp $CLIENT $TGT" && exit 1
+    echo "$0 : $(hostname) $TGT file doesn't exist after cp $CLIENT $TGT" && exit 1
 
 if [ "x$CHROOT" == "xyes" ]; then
 	echo "copying necessary libs to $DIR"
-- 
1.8.3.1