Author: kpvdr
Date: Mon May 24 15:48:18 2010
New Revision: 947678
URL: http://svn.apache.org/viewvc?rev=947678&view=rev
Log:
Changed the names of tests which are installed in /usr/bin/ to be prefixed with
"qpid-". This will make these generic names easier to associate with qpid.
(BZ577353)
Added:
qpid/trunk/qpid/cpp/src/tests/qpid-client-test.cpp
- copied unchanged from r947606,
qpid/trunk/qpid/cpp/src/tests/client_test.cpp
qpid/trunk/qpid/cpp/src/tests/qpid-latency-test.cpp
- copied unchanged from r947606,
qpid/trunk/qpid/cpp/src/tests/latencytest.cpp
qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp
- copied, changed from r947606, qpid/trunk/qpid/cpp/src/tests/perftest.cpp
qpid/trunk/qpid/cpp/src/tests/qpid-topic-listener.cpp
- copied, changed from r947606,
qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp
qpid/trunk/qpid/cpp/src/tests/qpid-topic-publisher.cpp
- copied, changed from r947606,
qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp
qpid/trunk/qpid/cpp/src/tests/qpid-txtest.cpp
- copied unchanged from r947606, qpid/trunk/qpid/cpp/src/tests/txtest.cpp
Removed:
qpid/trunk/qpid/cpp/src/tests/client_test.cpp
qpid/trunk/qpid/cpp/src/tests/latencytest.cpp
qpid/trunk/qpid/cpp/src/tests/perftest.cpp
qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp
qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp
qpid/trunk/qpid/cpp/src/tests/txtest.cpp
Modified:
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
qpid/trunk/qpid/cpp/src/tests/Makefile.am
qpid/trunk/qpid/cpp/src/tests/cluster_authentication_soak.cpp
qpid/trunk/qpid/cpp/src/tests/cluster_tests.py
qpid/trunk/qpid/cpp/src/tests/quick_perftest
qpid/trunk/qpid/cpp/src/tests/quick_txtest
qpid/trunk/qpid/cpp/src/tests/run_perftest
qpid/trunk/qpid/cpp/src/tests/ssl_test
qpid/trunk/qpid/cpp/src/tests/topictest
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=947678&r1=947677&r2=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Mon May 24 15:48:18 2010
@@ -182,40 +182,40 @@ endif (BUILD_CLUSTER)
#
# Other test programs
#
-add_executable (perftest perftest.cpp ${platform_test_additions})
-target_link_libraries (perftest qpidclient)
-#perftest_SOURCES=perftest.cpp test_tools.h TestOptions.h ConnectionOptions.h
-remember_location(perftest)
-
-add_executable (txtest txtest.cpp ${platform_test_additions})
-target_link_libraries (txtest qpidclient)
-#txtest_SOURCES=txtest.cpp TestOptions.h ConnectionOptions.h
-remember_location(txtest)
-
-add_executable (latencytest latencytest.cpp ${platform_test_additions})
-target_link_libraries (latencytest qpidclient)
-#latencytest_SOURCES=latencytest.cpp TestOptions.h ConnectionOptions.h
-remember_location(latencytest)
+add_executable (qpid-perftest qpid-perftest.cpp ${platform_test_additions})
+target_link_libraries (qpid-perftest qpidclient)
+#qpid_perftest_SOURCES=qpid-perftest.cpp test_tools.h TestOptions.h
ConnectionOptions.h
+remember_location(qpid-perftest)
+
+add_executable (qpid-txtest qpid-txtest.cpp ${platform_test_additions})
+target_link_libraries (qpid-txtest qpidclient)
+#qpid_txtest_SOURCES=qpid-txtest.cpp TestOptions.h ConnectionOptions.h
+remember_location(qpid-txtest)
+
+add_executable (qpid-latency-test qpid-latency-test.cpp
${platform_test_additions})
+target_link_libraries (qpid-latency-test qpidclient)
+#qpid_latencytest_SOURCES=qpid-latency-test.cpp TestOptions.h
ConnectionOptions.h
+remember_location(qpid-latency-test)
add_executable (echotest echotest.cpp ${platform_test_additions})
target_link_libraries (echotest qpidclient)
#echotest_SOURCES=echotest.cpp TestOptions.h ConnectionOptions.h
remember_location(echotest)
-add_executable (client_test client_test.cpp ${platform_test_additions})
-target_link_libraries (client_test qpidclient)
-#client_test_SOURCES=client_test.cpp TestOptions.h ConnectionOptions.h
-remember_location(client_test)
-
-add_executable (topic_listener topic_listener.cpp ${platform_test_additions})
-target_link_libraries (topic_listener qpidclient)
-#topic_listener_SOURCES=topic_listener.cpp TestOptions.h ConnectionOptions.h
-remember_location(topic_listener)
-
-add_executable (topic_publisher topic_publisher.cpp ${platform_test_additions})
-target_link_libraries (topic_publisher qpidclient)
-#topic_publisher_SOURCES=topic_publisher.cpp TestOptions.h ConnectionOptions.h
-remember_location(topic_publisher)
+add_executable (qpid-client-test qpid-client-test.cpp
${platform_test_additions})
+target_link_libraries (qpid-client-test qpidclient)
+#qpid_client_test_SOURCES=qpid-client-test.cpp TestOptions.h
ConnectionOptions.h
+remember_location(qpid-client-test)
+
+add_executable (qpid-topic-listener qpid-topic-listener.cpp
${platform_test_additions})
+target_link_libraries (qpid-topic-listener qpidclient)
+#qpid_topic_listener_SOURCES=qpid-topic-listener.cpp TestOptions.h
ConnectionOptions.h
+remember_location(qpid-topic-listener)
+
+add_executable (qpid-topic-publisher qpid-topic-publisher.cpp
${platform_test_additions})
+target_link_libraries (qpid-topic-publisher qpidclient)
+#qpid_topic_publisher_SOURCES=qpid-topic-publisher.cpp TestOptions.h
ConnectionOptions.h
+remember_location(qpid-topic-publisher)
add_executable (publish publish.cpp ${platform_test_additions})
target_link_libraries (publish qpidclient)
@@ -272,8 +272,8 @@ add_executable (qpid_send qpid_send.cpp
target_link_libraries (qpid_send qpidmessaging)
remember_location(qpid_send)
-# perftest and latencytest are generally useful so install them
-install (TARGETS perftest latencytest RUNTIME
+# qpid-perftest and qpid-latency-test are generally useful so install them
+install (TARGETS qpid-perftest qpid-latency-test RUNTIME
DESTINATION ${QPID_INSTALL_BINDIR})
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
@@ -286,8 +286,8 @@ set(test_wrap ${shell} ${CMAKE_CURRENT_S
add_test (unit_test ${test_wrap} ${unit_test_LOCATION})
add_test (start_broker ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/start_broker${test_script_suffix})
-add_test (client_test ${test_wrap} ${client_test_LOCATION})
-add_test (quick_perftest ${test_wrap} ${perftest_LOCATION} --summary --count
100)
+add_test (qpid-client-test ${test_wrap} ${client_test_LOCATION})
+add_test (quick_perftest ${test_wrap} ${qpid-perftest_LOCATION} --summary
--count 100)
add_test (quick_topictest ${test_wrap}
${CMAKE_CURRENT_SOURCE_DIR}/quick_topictest${test_script_suffix})
add_test (quick_txtest ${test_wrap} ${txtest_LOCATION} --queues 4 --tx-count
10 --quiet)
if (PYTHON_EXECUTABLE)
Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=947678&r1=947677&r2=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Mon May 24 15:48:18 2010
@@ -184,35 +184,35 @@ qpid_send_SOURCES = \
Statistics.cpp
qpid_send_LDADD = $(lib_messaging)
-qpidtest_PROGRAMS+=perftest
-perftest_SOURCES=perftest.cpp test_tools.h TestOptions.h ConnectionOptions.h
-perftest_INCLUDES=$(PUBLIC_INCLUDES)
-perftest_LDADD=$(lib_client)
-
-qpidtest_PROGRAMS+=txtest
-txtest_INCLUDES=$(PUBLIC_INCLUDES)
-txtest_SOURCES=txtest.cpp TestOptions.h ConnectionOptions.h
-txtest_LDADD=$(lib_client)
-
-qpidtest_PROGRAMS+=latencytest
-latencytest_INCLUDES=$(PUBLIC_INCLUDES)
-latencytest_SOURCES=latencytest.cpp TestOptions.h ConnectionOptions.h
-latencytest_LDADD=$(lib_client)
-
-qpidtest_PROGRAMS+=client_test
-client_test_INCLUDES=$(PUBLIC_INCLUDES)
-client_test_SOURCES=client_test.cpp TestOptions.h ConnectionOptions.h
-client_test_LDADD=$(lib_client)
-
-qpidtest_PROGRAMS+=topic_listener
-topic_listener_INCLUDES=$(PUBLIC_INCLUDES)
-topic_listener_SOURCES=topic_listener.cpp TestOptions.h ConnectionOptions.h
-topic_listener_LDADD=$(lib_client)
-
-qpidtest_PROGRAMS+=topic_publisher
-topic_publisher_INCLUDES=$(PUBLIC_INCLUDES)
-topic_publisher_SOURCES=topic_publisher.cpp TestOptions.h ConnectionOptions.h
-topic_publisher_LDADD=$(lib_client)
+qpidtest_PROGRAMS+=qpid-perftest
+qpid_perftest_SOURCES=qpid-perftest.cpp test_tools.h TestOptions.h
ConnectionOptions.h
+qpid_perftest_INCLUDES=$(PUBLIC_INCLUDES)
+qpid_perftest_LDADD=$(lib_client)
+
+qpidtest_PROGRAMS+=qpid-txtest
+qpid_txtest_INCLUDES=$(PUBLIC_INCLUDES)
+qpid_txtest_SOURCES=qpid-txtest.cpp TestOptions.h ConnectionOptions.h
+qpid_txtest_LDADD=$(lib_client)
+
+qpidtest_PROGRAMS+=qpid-latency-test
+qpid_latency_test_INCLUDES=$(PUBLIC_INCLUDES)
+qpid_latency_test_SOURCES=qpid-latency-test.cpp TestOptions.h
ConnectionOptions.h
+qpid_latency_test_LDADD=$(lib_client)
+
+qpidtest_PROGRAMS+=qpid-client-test
+qpid_client_test_INCLUDES=$(PUBLIC_INCLUDES)
+qpid_client_test_SOURCES=qpid-client-test.cpp TestOptions.h ConnectionOptions.h
+qpid_client_test_LDADD=$(lib_client)
+
+qpidtest_PROGRAMS+=qpid-topic-listener
+qpid_topic_listener_INCLUDES=$(PUBLIC_INCLUDES)
+qpid_topic_listener_SOURCES=qpid-topic-listener.cpp TestOptions.h
ConnectionOptions.h
+qpid_topic_listener_LDADD=$(lib_client)
+
+qpidtest_PROGRAMS+=qpid-topic-publisher
+qpid_topic_publisher_INCLUDES=$(PUBLIC_INCLUDES)
+qpid_topic_publisher_SOURCES=qpid-topic-publisher.cpp TestOptions.h
ConnectionOptions.h
+qpid_topic_publisher_LDADD=$(lib_client)
qpidtest_PROGRAMS+=qpid_ping
qpid_ping_INCLUDES=$(PUBLIC_INCLUDES)
@@ -313,7 +313,7 @@ TESTS_ENVIRONMENT = \
QPID_DATA_DIR= \
$(srcdir)/run_test
-system_tests = client_test quick_perftest quick_topictest run_header_test
quick_txtest
+system_tests = qpid-client-test quick_perftest quick_topictest run_header_test
quick_txtest
TESTS += start_broker $(system_tests) python_tests stop_broker
run_federation_tests run_acl_tests run_cli_tests replication_test
EXTRA_DIST += \
Modified: qpid/trunk/qpid/cpp/src/tests/cluster_authentication_soak.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster_authentication_soak.cpp?rev=947678&r1=947677&r2=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster_authentication_soak.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster_authentication_soak.cpp Mon May 24
15:48:18 2010
@@ -104,10 +104,10 @@ runPerftest ( ) {
stringstream portSs;
portSs << newbiePort;
- char const * path = "./perftest";
+ char const * path = "./qpid-perftest";
vector<char const *> argv;
- argv.push_back ( "./perftest" );
+ argv.push_back ( "./qpid-perftest" );
argv.push_back ( "-p" );
argv.push_back ( portSs.str().c_str() );
argv.push_back ( "--username" );
@@ -129,7 +129,7 @@ runPerftest ( ) {
execv ( path, const_cast<char * const *>(&argv[0]) );
// The exec failed: we are still in parent process.
- perror ( "error running perftest: " );
+ perror ( "error running qpid-perftest: " );
return false;
}
else {
@@ -146,19 +146,19 @@ runPerftest ( ) {
if ( returned_pid == pid ) {
int exit_status = WEXITSTATUS(status);
if ( exit_status ) {
- cerr << "Perftest failed. exit_status was: " << exit_status;
+ cerr << "qpid-perftest failed. exit_status was: " <<
exit_status;
return false;
}
else {
- return true; // perftest succeeded.
+ return true; // qpid-perftest succeeded.
}
}
- else { // perftest has not yet completed.
+ else { // qpid-perftest has not yet completed.
gettimeofday ( & currentTime, 0 );
timersub ( & currentTime, & startTime, & duration );
if ( duration.tv_sec > 60 ) {
kill ( pid, 9 );
- cerr << "Perftest pid " << pid << " hanging: killed.\n";
+ cerr << "qpid-perftest pid " << pid << " hanging: killed.\n";
return false;
}
}
@@ -214,7 +214,7 @@ main ( int argc, char ** argv )
sleep ( 3 );
- /* Run all perftest iterations, and only then check for brokers
+ /* Run all qpid-perftest iterations, and only then check for brokers
* still being up. If you just want a quick check for the failure
* mode in which a single iteration would kill all brokers except
* the client-connected one, just run it with the iterations arg
@@ -222,14 +222,14 @@ main ( int argc, char ** argv )
*/
for ( int iteration = 0; iteration < n_iterations; ++ iteration ) {
if ( ! runPerftest ( ) ) {
- cerr << "Perftest " << iteration << " failed.\n";
+ cerr << "qpid-perftest " << iteration << " failed.\n";
return 1;
}
if ( ! ( iteration % 10 ) ) {
- cerr << "perftest " << iteration << " complete. -------------- \n";
+ cerr << "qpid-perftest " << iteration << " complete.
-------------- \n";
}
}
- cerr << "\nperftest " << n_iterations << " iterations complete.
-------------- \n\n";
+ cerr << "\nqpid-perftest " << n_iterations << " iterations complete.
-------------- \n\n";
if ( ! allBrokersAreAlive ( brokers ) ) {
cerr << "not all brokers are alive.\n";
Modified: qpid/trunk/qpid/cpp/src/tests/cluster_tests.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster_tests.py?rev=947678&r1=947677&r2=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster_tests.py Mon May 24 15:48:18 2010
@@ -211,7 +211,7 @@ class LongTests(BrokerTest):
"""Start ordinary clients for a broker. Start one client per
broker.
Round-robin on a colllection of different clients."""
cmds=[
- ["perftest", "--count", 50000,
+ ["qpid-perftest", "--count", 50000,
"--base-name", str(qpid.datatypes.uuid4()), "--port",
broker.port()],
["qpid-queue-stats", "-a", "localhost:%s" %(broker.port())],
["testagent", "localhost", str(broker.port())] ]
Copied: qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp (from r947606,
qpid/trunk/qpid/cpp/src/tests/perftest.cpp)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp?p2=qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp&p1=qpid/trunk/qpid/cpp/src/tests/perftest.cpp&r1=947606&r2=947678&rev=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/perftest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp Mon May 24 15:48:18 2010
@@ -111,7 +111,7 @@ struct Opts : public TestOptions {
Opts() :
TestOptions(helpText),
- setup(false), control(false), publish(false), subscribe(false),
baseName("perftest"),
+ setup(false), control(false), publish(false), subscribe(false),
baseName("qpid-perftest"),
pubs(1), count(500000), size(1024), confirm(true), durable(false),
uniqueData(false), syncPub(false),
subs(1), ack(0),
qt(1),singleConnect(false), iterations(1), mode(SHARED),
summary(false),
@@ -210,15 +210,15 @@ struct Opts : public TestOptions {
};
const std::string Opts::helpText=
-"There are two ways to use perftest: single process or multi-process.\n\n"
+"There are two ways to use qpid-perftest: single process or multi-process.\n\n"
"If none of the --setup, --publish, --subscribe or --control options\n"
-"are given perftest will run a single-process test.\n"
+"are given qpid-perftest will run a single-process test.\n"
"For a multi-process test first run:\n"
-" perftest --setup <other options>\n"
+" qpid-perftest --setup <other options>\n"
"and wait for it to complete. The remaining process should run
concurrently::\n"
-"Run --npubs times: perftest --publish <other options>\n"
-"Run --nsubs times: perftest --subscribe <other options>\n"
-"Run once: perftest --control <other options>\n"
+"Run --npubs times: pqid-perftest --publish <other options>\n"
+"Run --nsubs times: qpid-perftest --subscribe <other options>\n"
+"Run once: qpid-perftest --control <other options>\n"
"Note the <other options> must be identical for all processes.\n";
Opts opts;
Copied: qpid/trunk/qpid/cpp/src/tests/qpid-topic-listener.cpp (from r947606,
qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid-topic-listener.cpp?p2=qpid/trunk/qpid/cpp/src/tests/qpid-topic-listener.cpp&p1=qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp&r1=947606&r2=947678&rev=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid-topic-listener.cpp Mon May 24 15:48:18
2010
@@ -21,7 +21,7 @@
/**
* This file provides one half of a test and example of a pub-sub
- * style of interaction. See topic_publisher.cpp for the other half,
+ * style of interaction. See qpid-topic-publisher.cpp for the other half,
* in which the logic for publishing is defined.
*
* This file contains the listener logic. A listener will subscribe to
@@ -183,7 +183,7 @@ int main(int argc, char** argv){
if( args.statusqueue.length() > 0 ) {
stringstream msg_str;
- msg_str << "topic_listener: " <<
qpid::sys::SystemInfo::getProcessId();
+ msg_str << "qpid-topic-listener: " <<
qpid::sys::SystemInfo::getProcessId();
session.messageTransfer(arg::content=Message(msg_str.str(),
args.statusqueue));
cout << "Ready status put on queue '" << args.statusqueue <<
"'" << endl;
}
@@ -192,7 +192,7 @@ int main(int argc, char** argv){
session.txSelect();
}
- cout << "topic_listener: listening..." << endl;
+ cout << "qpid-topic-listener: listening..." << endl;
mgr.run();
if (args.durable) {
session.queueDelete(arg::queue=control);
@@ -203,7 +203,7 @@ int main(int argc, char** argv){
}
return 0;
} catch (const std::exception& error) {
- cout << "topic_listener: " << error.what() << endl;
+ cout << "qpid-topic-listener: " << error.what() << endl;
}
return 1;
}
Copied: qpid/trunk/qpid/cpp/src/tests/qpid-topic-publisher.cpp (from r947606,
qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid-topic-publisher.cpp?p2=qpid/trunk/qpid/cpp/src/tests/qpid-topic-publisher.cpp&p1=qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp&r1=947606&r2=947678&rev=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid-topic-publisher.cpp Mon May 24 15:48:18
2010
@@ -21,7 +21,7 @@
/**
* This file provides one half of a test and example of a pub-sub
- * style of interaction. See topic_listener.cpp for the other half, in
+ * style of interaction. See qpid-topic-listener.cpp for the other half, in
* which the logic for subscribers is defined.
*
* This file contains the publisher logic. The publisher will send a
Modified: qpid/trunk/qpid/cpp/src/tests/quick_perftest
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/quick_perftest?rev=947678&r1=947677&r2=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/quick_perftest (original)
+++ qpid/trunk/qpid/cpp/src/tests/quick_perftest Mon May 24 15:48:18 2010
@@ -19,4 +19,4 @@
# under the License.
#
-exec `dirname $0`/run_test ./perftest --summary --count 100
+exec `dirname $0`/run_test ./qpid-perftest --summary --count 100
Modified: qpid/trunk/qpid/cpp/src/tests/quick_txtest
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/quick_txtest?rev=947678&r1=947677&r2=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/quick_txtest (original)
+++ qpid/trunk/qpid/cpp/src/tests/quick_txtest Mon May 24 15:48:18 2010
@@ -19,4 +19,4 @@
# under the License.
#
-exec `dirname $0`/run_test ./txtest --queues 4 --tx-count 10 --quiet
+exec `dirname $0`/run_test ./qpid-txtest --queues 4 --tx-count 10 --quiet
Modified: qpid/trunk/qpid/cpp/src/tests/run_perftest
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_perftest?rev=947678&r1=947677&r2=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_perftest (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_perftest Mon May 24 15:48:18 2010
@@ -19,10 +19,10 @@
# under the License.
#
-# Args: count [perftest options...]
-# Run a perftest with count multiplied.
+# Args: count [qpid-perftest options...]
+# Run a qpid-perftest with count multiplied.
#
MULTIPLIER=3
COUNT=`expr $1 \* $MULTIPLIER`
shift
-exec `dirname $0`/run_test ./perftest --summary --count $COUNT "$@"
+exec `dirname $0`/run_test ./qpid-perftest --summary --count $COUNT "$@"
Modified: qpid/trunk/qpid/cpp/src/tests/ssl_test
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ssl_test?rev=947678&r1=947677&r2=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ssl_test (original)
+++ qpid/trunk/qpid/cpp/src/tests/ssl_test Mon May 24 15:48:18 2010
@@ -73,7 +73,7 @@ export QPID_SSL_CERT_DB=${CERT_DIR}
export QPID_SSL_CERT_PASSWORD_FILE=${CERT_PW_FILE}
## Test connection via connection settings
-./perftest --count ${COUNT} --port ${PORT} -P ssl -b $TEST_HOSTNAME --summary
+./qpid-perftest --count ${COUNT} --port ${PORT} -P ssl -b $TEST_HOSTNAME
--summary
## Test connection with a URL
URL=amqp:ssl:$TEST_HOSTNAME:$PORT
Modified: qpid/trunk/qpid/cpp/src/tests/topictest
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/topictest?rev=947678&r1=947677&r2=947678&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/topictest (original)
+++ qpid/trunk/qpid/cpp/src/tests/topictest Mon May 24 15:48:18 2010
@@ -46,11 +46,11 @@ done
subscribe() {
echo Start subscriber $1
LOG="subscriber_$1.log"
- ./topic_listener $TRANSACTIONAL > $LOG 2>&1 && rm -f $LOG
+ ./qpid-topic-listener $TRANSACTIONAL > $LOG 2>&1 && rm -f $LOG
}
publish() {
- ./topic_publisher --messages $MESSAGES --batches $BATCHES --subscribers
$SUBSCRIBERS $HOST $TRANSACTIONAL
+ ./qpid-topic-publisher --messages $MESSAGES --batches $BATCHES
--subscribers $SUBSCRIBERS $HOST $TRANSACTIONAL
}
for ((i=$SUBSCRIBERS ; i--; )); do
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
