Author: rgreig
Date: Thu Mar 1 07:09:17 2007
New Revision: 513371
URL: http://svn.apache.org/viewvc?view=rev&rev=513371
Log:
(Patch submitted by Rupert Smith) Small changes to use virtual hosts, merged
back in from perftesting_persistent branch.
Modified:
incubator/qpid/trunk/qpid/cpp/tests/client_test.cpp
incubator/qpid/trunk/qpid/cpp/tests/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/tests/topic_publisher.cpp
incubator/qpid/trunk/qpid/cpp/tests/topictest
Modified: incubator/qpid/trunk/qpid/cpp/tests/client_test.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/client_test.cpp?view=diff&rev=513371&r1=513370&r2=513371
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/client_test.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/client_test.cpp Thu Mar 1 07:09:17 2007
@@ -68,7 +68,7 @@
Connection con(argc > 1);
string host("localhost");
- con.open(host);
+ con.open(host, 5672, "guest", "guest", "/test");
std::cout << "Opened connection." << std::endl;
//Create and open a channel on the connection through which
Modified: incubator/qpid/trunk/qpid/cpp/tests/topic_listener.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/topic_listener.cpp?view=diff&rev=513371&r1=513370&r2=513371
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/topic_listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/topic_listener.cpp Thu Mar 1 07:09:17
2007
@@ -103,7 +103,7 @@
}else{
try{
Connection connection(args.getTrace());
- connection.open(args.getHost(), args.getPort());
+ connection.open(args.getHost(), args.getPort(), "guest", "guest",
"/test");
Channel channel(args.getTransactional(), args.getPrefetch());
connection.openChannel(&channel);
Modified: incubator/qpid/trunk/qpid/cpp/tests/topic_publisher.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/topic_publisher.cpp?view=diff&rev=513371&r1=513370&r2=513371
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/topic_publisher.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/topic_publisher.cpp Thu Mar 1 07:09:17
2007
@@ -118,7 +118,7 @@
}else{
try{
Connection connection(args.getTrace());
- connection.open(args.getHost(), args.getPort());
+ connection.open(args.getHost(), args.getPort(), "guest", "guest",
"/test");
Channel channel(args.getTransactional(), args.getPrefetch());
connection.openChannel(&channel);
Modified: incubator/qpid/trunk/qpid/cpp/tests/topictest
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/topictest?view=diff&rev=513371&r1=513370&r2=513371
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/topictest (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/topictest Thu Mar 1 07:09:17 2007
@@ -1,42 +1,42 @@
-#!/bin/bash
-# Run the c++ or java topic test
-
-. `dirname $0`/env
-
-# Edit parameters here:
-
-# Big test:
-# LISTENERS=10
-# MESSAGES=10000
-# BATCHES=20
-
-LISTENERS=10
-MESSAGES=2000
-BATCHES=10
-
-cppcmds() {
- LISTEN_CMD=topic_listener
- PUBLISH_CMD="topic_publisher -messages $MESSAGES -batches $BATCHES
-subscribers $LISTENERS"
-}
-
-javacmds() {
- DEF=-Damqj.logging.level="error"
- LISTEN_CMD="qpid-run $DEF org.apache.qpid.topic.Listener"
- PUBLISH_CMD="qpid-run $DEF org.apache.qpid.topic.Publisher -messages
$MESSAGES -batch $BATCHES -clients $LISTENERS"
-}
-
-case $1 in
- c) cppcmds ;;
- j) javacmds ;;
- *) cppcmds ;;
-esac
-
-for ((i=$LISTENERS ; i--; )); do
- $LISTEN_CMD > /dev/null 2>&1 &
-done
-sleep 1
-echo $PUBLISH_CMD $OPTIONS
-
-STATS=~/bin/topictest.times
-echo "---- topictest `date`" >> $STATS
-$PUBLISH_CMD $OPTIONS | tee -a $STATS
+#!/bin/bash
+# Run the c++ or java topic test
+
+. `dirname $0`/env
+
+# Edit parameters here:
+
+# Big test:
+# LISTENERS=10
+# MESSAGES=10000
+# BATCHES=20
+
+LISTENERS=10
+MESSAGES=2000
+BATCHES=10
+
+cppcmds() {
+ LISTEN_CMD=./topic_listener
+ PUBLISH_CMD="./topic_publisher -messages $MESSAGES -batches $BATCHES
-subscribers $LISTENERS"
+}
+
+javacmds() {
+ DEF=-Damqj.logging.level="error"
+ LISTEN_CMD="qpid-run $DEF org.apache.qpid.topic.Listener"
+ PUBLISH_CMD="qpid-run $DEF org.apache.qpid.topic.Publisher -messages
$MESSAGES -batch $BATCHES -clients $LISTENERS"
+}
+
+case $1 in
+ c) cppcmds ;;
+ j) javacmds ;;
+ *) cppcmds ;;
+esac
+
+for ((i=$LISTENERS ; i--; )); do
+ $LISTEN_CMD > /dev/null 2>&1 &
+done
+sleep 1
+echo $PUBLISH_CMD $OPTIONS
+
+STATS=~/bin/topictest.times
+echo "---- topictest `date`" >> $STATS
+$PUBLISH_CMD $OPTIONS | tee -a $STATS
