From 13ef73c124a5797d069d162acc4336ed99d0e35a Mon Sep 17 00:00:00 2001 From: Rupert Smith Date: Fri, 9 Nov 2007 15:31:03 +0000 Subject: Merged perf test latest from M2.1 onto trunk. Many fixes and now tests through pure JMS. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@593566 13f79535-47bb-0310-9956-ffa450edef68 --- java/perftests/etc/jndi/activemq.properties | 3 +++ java/perftests/etc/jndi/perftests.properties | 2 ++ java/perftests/etc/jndi/swiftmq.properties | 3 +++ java/perftests/etc/scripts/Test-ActiveMQ.sh | 14 ++++++++++++++ java/perftests/etc/scripts/Test-SwiftMQ.sh | 12 ++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 java/perftests/etc/jndi/activemq.properties create mode 100644 java/perftests/etc/jndi/perftests.properties create mode 100644 java/perftests/etc/jndi/swiftmq.properties create mode 100644 java/perftests/etc/scripts/Test-ActiveMQ.sh create mode 100644 java/perftests/etc/scripts/Test-SwiftMQ.sh (limited to 'java/perftests/etc') diff --git a/java/perftests/etc/jndi/activemq.properties b/java/perftests/etc/jndi/activemq.properties new file mode 100644 index 0000000000..0616bee2e0 --- /dev/null +++ b/java/perftests/etc/jndi/activemq.properties @@ -0,0 +1,3 @@ +java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url= tcp://localhost:61616 + diff --git a/java/perftests/etc/jndi/perftests.properties b/java/perftests/etc/jndi/perftests.properties new file mode 100644 index 0000000000..6cc16203e9 --- /dev/null +++ b/java/perftests/etc/jndi/perftests.properties @@ -0,0 +1,2 @@ +java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory +connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672' diff --git a/java/perftests/etc/jndi/swiftmq.properties b/java/perftests/etc/jndi/swiftmq.properties new file mode 100644 index 0000000000..5a3b3ea7ec --- /dev/null +++ b/java/perftests/etc/jndi/swiftmq.properties @@ -0,0 +1,3 @@ +java.naming.factory.initial = com.swiftmq.jndi.InitialContextFactoryImpl +java.naming.provider.url=smqp://localhost:4001/timeout=10000 +#connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672' diff --git a/java/perftests/etc/scripts/Test-ActiveMQ.sh b/java/perftests/etc/scripts/Test-ActiveMQ.sh new file mode 100644 index 0000000000..099259de3d --- /dev/null +++ b/java/perftests/etc/scripts/Test-ActiveMQ.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +# Parse arguements taking all - prefixed args as JAVA_OPTS +for arg in "$@"; do + if [[ $arg == -java:* ]]; then + JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2` " + else + ARGS="${ARGS}$arg " + fi +done + +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx1024m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp "qpid-perftests-1.0-incubating-M2.1-SNAPSHOT.jar;activemq-jars/apache-activemq-4.1.1.jar" uk.co.thebadgerset.junit.extensions.TKTestRunner -n Test-ActiveMQ -s[1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf properties=activemq.properties factoryName=ConnectionFactory ${ARGS} + +# queueNamePostfix=@router1 overrideClientId=true \ No newline at end of file diff --git a/java/perftests/etc/scripts/Test-SwiftMQ.sh b/java/perftests/etc/scripts/Test-SwiftMQ.sh new file mode 100644 index 0000000000..e9ee85aca7 --- /dev/null +++ b/java/perftests/etc/scripts/Test-SwiftMQ.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Parse arguements taking all - prefixed args as JAVA_OPTS +for arg in "$@"; do + if [[ $arg == -java:* ]]; then + JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2` " + else + ARGS="${ARGS}$arg " + fi +done + +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx1024m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp "qpid-perftests-1.0-incubating-M2.1-SNAPSHOT.jar;swiftmqjars/swiftmq.jar" uk.co.thebadgerset.junit.extensions.TKTestRunner -n Test-SwiftMQ -s[1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf properties=swiftmq.properties factoryName=ConnectionFactory queueNamePostfix=@router1 overrideClientId=true ${ARGS} \ No newline at end of file -- cgit v1.2.1