summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/qpid-test-cluster
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-09-30 20:06:36 +0000
committerAlan Conway <aconway@apache.org>2010-09-30 20:06:36 +0000
commit90d1a072de027f7c67d47a875047027e3ef0c0a0 (patch)
treea8f4bfee21779f550d3c670196d00b56c3dac27c /qpid/cpp/src/tests/qpid-test-cluster
parent877ddb37e8874084771aaa814589b3ae4c9e020c (diff)
downloadqpid-python-90d1a072de027f7c67d47a875047027e3ef0c0a0.tar.gz
Improvements to output & message distribution for qpid-cpp-benchmark.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1003231 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/qpid-test-cluster')
-rwxr-xr-xqpid/cpp/src/tests/qpid-test-cluster5
1 files changed, 3 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/qpid-test-cluster b/qpid/cpp/src/tests/qpid-test-cluster
index d604b5ba17..53d2bf436d 100755
--- a/qpid/cpp/src/tests/qpid-test-cluster
+++ b/qpid/cpp/src/tests/qpid-test-cluster
@@ -56,6 +56,7 @@ QPIDD_ARGS="$QPIDD_ARGS $*"
if test -n "$CONF_FILE"; then
copyall $CONF_FILE
QPIDD_ARGS="$QPIDD_ARGS --config $CONF_FILE"
+ QPID_PORT=${QPID_PORT:-`awk -F= '/^ *port=/ {print $2}' $CONF_FILE`}
fi
if test -n "$ENV_FILE"; then
copyall $ENV_FILE
@@ -76,9 +77,9 @@ do_stop() {
}
do_check() {
-# FIXME aconway 2010-09-29: add check - get port from config.
for h in $HOSTS; do
- if qpid-ping -b $h -q $OPTS &> /dev/null; then
+ test -n "$QPID_PORT" && PORTOPT="-p $QPID_PORT"
+ if qpid-ping -b $h $PORTOPT -q $* &> /dev/null; then
echo $h ok
else
echo $h failed