diff options
Diffstat (limited to 'qpid/java/broker')
| -rw-r--r-- | qpid/java/broker/etc/config.xml | 1 | ||||
| -rw-r--r-- | qpid/java/broker/test/build-module.xml | 41 |
2 files changed, 25 insertions, 17 deletions
diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml index 0e4c450047..cdd15fb789 100644 --- a/qpid/java/broker/etc/config.xml +++ b/qpid/java/broker/etc/config.xml @@ -23,6 +23,7 @@ <connector> <ssl>false</ssl> <nonssl>true</nonssl> + <qpidnio>true</qpidnio> <transport>nio</transport> <port>5672</port> <sslport>8672</sslport> diff --git a/qpid/java/broker/test/build-module.xml b/qpid/java/broker/test/build-module.xml index 8c971b9a26..9bdf4cbf4a 100644 --- a/qpid/java/broker/test/build-module.xml +++ b/qpid/java/broker/test/build-module.xml @@ -16,25 +16,32 @@ - --> <project name="Broker Tests" default="build"> - <property name="module.depends" value="broker common"/> - <property name="module.dist" value="false"/> + <property name="module.depends" value="broker common"/> + <property name="module.dist" value="false"/> - <import file="../../module.xml"/> + <import file="../../module.xml"/> - <target name="test" depends="build"> - <junit fork="yes" showoutput="true" haltonfailure="yes"> - <test name="org.apache.qpid.server.UnitTests"/> - <formatter type="plain"/> - <classpath refid="module.class.path"/> - </junit> - </target> + <target name="test" depends="build"> + <junit fork="yes" showoutput="true" haltonfailure="yes"> + <test name="org.apache.qpid.server.UnitTests"/> + <formatter type="plain"/> + <classpath refid="module.class.path"/> + </junit> + </target> - <target name="xmltest" depends="build"> - <junit fork="yes" showoutput="true" haltonfailure="no"> - <test name="org.apache.qpid.server.UnitTests"/> - <formatter type="xml" usefile="junit.report.xml"/> - <classpath refid="module.class.path"/> - </junit> - </target> + <target name="testreport" depends="build"> + <junit fork="yes" printsummary="yes" haltonfailure="no"> + <test name="org.apache.qpid.server.UnitTests" fork="yes" todir="${module.test.reports}"/> + <formatter type="xml" /> + <classpath refid="module.class.path" /> + </junit> + + <junitreport todir="${module.test.reports}"> + <fileset dir="${module.test.reports}"> + <include name="TEST-*.xml"/> + </fileset> + <report todir="${module.test.reports}"/> + </junitreport> + </target> </project> |