summaryrefslogtreecommitdiff
path: root/qpid/java/module.xml
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2009-11-03 15:21:54 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2009-11-03 15:21:54 +0000
commitc93344c7da74411457a5eddd8cd2b4bf9e28a2d9 (patch)
tree8309bffffab4c4ac84e7f5ccbdcebcdb5f4de6b3 /qpid/java/module.xml
parent7c79357e1b8eb9e71b8a99a76e27a3f7149a1dcc (diff)
downloadqpid-python-c93344c7da74411457a5eddd8cd2b4bf9e28a2d9.tar.gz
This adds some minor enhancements to our test framework.
It introduces two jvm args "broker.log.interleave" and "broker.log.prefix". broker.log.interleave if set to false, will print the broker output into a separate file. The file name will be in the following format and placed alongside the test output. "%s/TEST-%s.broker.out" Ex. TEST-org.apache.qpid.test.client.failover.FailoverTest.testP2PFailover.out TEST-org.apache.qpid.test.client.failover.FailoverTest.testP2PFailover.broker.out "broker.log.interleave" is set to true in module.xml to default to the current behaviour. "broker.log.prefix" which is set to "BROKER: " in the module.xml will prefix each broker output line. This would help to follow the log files more easily as it would help to distinguish between broker and client output. It would also be handy for grep. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@832452 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/module.xml')
-rw-r--r--qpid/java/module.xml13
1 files changed, 13 insertions, 0 deletions
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 9fcc8ded4d..1cd1afc0c3 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -60,6 +60,8 @@
<property name="module.release.bz2" location="${module.release}/${module.namever}.tar.bz2"/>
<property name="module.genpom.args" value=""/>
+ <property name="broker.log.prefix" value="BROKER: "/>
+ <property name="broker.log.interleave" value="true"/>
<property name="module.qpid.jar" location="${module.release.lib}/qpid-all.jar"/>
<basename property="qpid.jar.name" file="${module.qpid.jar}"/>
@@ -276,6 +278,7 @@
<sysproperty key="broker.stopped" value="${broker.stopped}" />
<sysproperty key="broker.config" value="${broker.config}" />
<sysproperty key="test.output" value="${module.results}"/>
+
<syspropertyset>
<propertyref prefix="test"/>
</syspropertyset>
@@ -284,7 +287,11 @@
</syspropertyset>
<syspropertyset>
<propertyref prefix="javax.net.ssl"/>
+ </syspropertyset>
+ <syspropertyset>
+ <propertyref prefix="broker"/>
</syspropertyset>
+
<sysproperty key="max_prefetch" value ="${max_prefetch}"/>
<sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/>
<sysproperty key="QPID_EXAMPLE_HOME" value="${qpid.home}"/>
@@ -526,6 +533,7 @@
</target>
<target name="cover-test" depends="instrument">
+
<mkdir dir="${build.coveragereport}" />
<junit fork="yes" forkmode="once" maxmemory="${test.mem}" reloading="no"
haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
@@ -543,9 +551,14 @@
<sysproperty key="broker.version" value="${broker.version}"/>
<sysproperty key="broker.ready" value="${broker.ready}" />
<sysproperty key="test.output" value="${module.results}"/>
+
<syspropertyset>
<propertyref prefix="test"/>
</syspropertyset>
+ <syspropertyset>
+ <propertyref prefix="broker"/>
+ </syspropertyset>
+
<sysproperty key="max_prefetch" value ="${max_prefetch}"/>
<sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/>
<sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/build"/>