From 01f8085bf6a14b5c29fae40ea5e9eac54f152dd7 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Tue, 26 Aug 2008 18:35:00 +0000
Subject: Test improvements.  - print rates for publish, consume  - consistent
 use of -s for spreadsheet-friendly output.  - start_cluster_hosts to start
 multi-host cluster via ssh.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@689166 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/tests/perfdist | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'cpp/src/tests/perfdist')

diff --git a/cpp/src/tests/perfdist b/cpp/src/tests/perfdist
index 816d2d99f6..b05787f37d 100755
--- a/cpp/src/tests/perfdist
+++ b/cpp/src/tests/perfdist
@@ -33,16 +33,24 @@ while test $# -gt 0; do
 	--publish|--subscribe|--setup|--control) usage "Don't pass perftest action flags: $1" ;;
 	--npubs) collect $1 $2; NPUBS=$2; shift 2 ;;
 	--nsubs) collect $1 $2; NSUBS=$2; shift 2 ;;
+	-s|--summary) collect $1; QUIET=yes; shift 1 ;;
 	--) COLLECT=HOSTS; shift ;; 
 	*) collect $1; shift ;;
     esac
 done
+
 if [ -z "$HOSTS" ]; then usage "No hosts listed after --"; fi
-PATH="`dirname $0`:$PATH"	
-PERFTEST="`which perftest` $ARGS" || usage "Can't find perftest executable"
+ADDPATH="$PWD"
+PATH=$ADDPATH:$PATH
+which perftest>/dev/null || exit 1
+PERFTEST="perftest $ARGS"
 
 HOSTS=($HOSTS)
-start() { ssh ${HOSTS[i % ${#HOSTS[*]}]} $PERFTEST $*& }
+start() {
+    HOST=${HOSTS[i % ${#HOSTS[*]}]}
+    test -z "$QUIET" && echo "Client $i on $HOST $*"
+    ssh -fT $HOST "PATH=$ADDPATH:\$PATH" $PERFTEST "$@"
+}
 
 $PERFTEST --setup
 for (( i=0 ; i < $NPUBS ; ++i)); do start --publish; done
-- 
cgit v1.2.1