From 8b21a8ec86208ab9c2893e1f6ee21553438fa7c9 Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Tue, 30 Jun 2009 10:46:35 +0000
Subject: Add some ring queue tests to make check-long (fix script to use
 QPID_PORT correctly)

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

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

diff --git a/cpp/src/tests/ring_queue_test b/cpp/src/tests/ring_queue_test
index b6479cf16d..5805989d7e 100755
--- a/cpp/src/tests/ring_queue_test
+++ b/cpp/src/tests/ring_queue_test
@@ -28,12 +28,13 @@ MESSAGES=10000
 SENDERS=1
 RECEIVERS=1
 CONCURRENT=0
+BROKER_URL="-a ${QPID_BROKER:-localhost}:${QPID_PORT:-5672}"
 
 setup() {
     if [[ $DURABLE -gt 0 ]]; then
         EXTRA_ARGS=" --durable"
     fi
-    qpid-config add queue $QUEUE_NAME --max-queue-count $LIMIT --limit-policy ring $EXTRA_ARGS
+    qpid-config $BROKER_URL add queue $QUEUE_NAME --max-queue-count $LIMIT --limit-policy ring $EXTRA_ARGS
 }
 
 send() {
@@ -47,7 +48,7 @@ receive() {
 
 cleanup() {
     rm -f sender_${QUEUE_NAME}_* receiver_${QUEUE_NAME}_*
-    qpid-config add queue $QUEUE_NAME
+    qpid-config $BROKER_URL add queue $QUEUE_NAME
 }
 
 log() {
@@ -140,7 +141,6 @@ Options:
       -q <queue>      the name of the queue to use
       -s <senders>    the number of senders to start
       -r <receivers>  the number of receivers to start
-      -u <url>
       -l <limit>      the limit for the ring queue
       -m <messages>   the number of messages to send
       -c              if specified, receivers will run concurrently with senders
@@ -156,7 +156,6 @@ while getopts "s:r:m:u:dch" opt ; do
 	s) SENDERS=$OPTARG ;;
 	r) RECEIVERS=$OPTARG ;;
 	m) MESSAGES=$OPTARG ;;
-	u) URL=$OPTARG ;;
         d) DURABLE=1 ;;
         c) CONCURRENT=1 ;;
         h) usage;;
-- 
cgit v1.2.1