From: Scott S. <sco...@jb...> - 2005-05-26 17:05:23
|
User: starksm Date: 05/05/26 13:05:03 Modified: jbosstest build.xml Log: Use the run-junit macrodef to reduce the junit task usage duplication. Revision Changes Path 1.464 +27 -112 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.463 retrieving revision 1.464 diff -u -b -r1.463 -r1.464 --- build.xml 21 May 2005 00:13:38 -0000 1.463 +++ build.xml 26 May 2005 17:05:03 -0000 1.464 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.463 2005/05/21 00:13:38 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.464 2005/05/26 17:05:03 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -551,6 +551,13 @@ <patternset id="compatibility.excludes"> <exclude name="org/jboss/test/compatibility/test/*TestCase.class"/> </patternset> + <!-- --> + <patternset id="binding-manager.includes"> + <include name="org/jboss/test/binding/*TestCase.class"/> + </patternset> + <patternset id="binding-manager.excludes"> + <exclude name="org/jboss/test/binding/*TestCase.class"/> + </patternset> <!-- Tests that are currently broken --> <patternset id="badtest.excludes"> @@ -576,6 +583,7 @@ <patternset refid="jbossxb.excludes"/> <patternset refid="deployment-service.excludes"/> <patternset refid="compatibility.excludes"/> + <patternset refid="binding-manager.excludes"/> </patternset> <!-- A target that allows for conditional dependency on the compilation and @@ -765,43 +773,19 @@ </create-config> <start-jboss conf="tomcat-ssl"/> <wait-on-host/> - <junit dir="${module.output}" - printsummary="${junit.printsummary}" - haltonerror="${junit.haltonerror}" - haltonfailure="${junit.haltonfailure}" - fork="${junit.fork}" - timeout="${junit.timeout}" - jvm="${junit.jvm}"> - - <jvmarg value="${junit.jvm.options}"/> - <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> - <sysproperty key="build.testlog" value="${build.testlog}"/> - <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - <sysproperty key="javax.net.ssl.keyStore" + <!-- Specify the JSSE properties --> + <property name="javax.net.ssl.keyStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore"/> - <sysproperty key="javax.net.ssl.keyStorePassword" value="unit-tests-client"/> - <sysproperty key="javax.net.ssl.trustStore" + <property name="javax.net.ssl.keyStorePassword" value="unit-tests-client"/> + <property name="javax.net.ssl.trustStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore"/> - <sysproperty key="javax.net.ssl.trustStorePassword" value="unit-tests-client"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="tests.classpath"/> - </classpath> - - <formatter type="xml" usefile="${junit.formatter.usefile}"/> - - <batchtest todir="${build.reports}" - haltonerror="${junit.batchtest.haltonerror}" - haltonfailure="${junit.batchtest.haltonfailure}" - fork="${junit.batchtest.fork}"> + <property name="javax.net.ssl.trustStorePassword" value="unit-tests-client"/> - <fileset dir="${build.classes}"> - <patternset refid="tc-ssl.includes"/> - </fileset> - </batchtest> - </junit> + <propertyset id="tomcat-ssl-tests-props"> + <propertyref prefix="javax.net.ssl"/> + </propertyset> + <run-junit junit.patternset="tc-ssl.includes" + junit.syspropertyset="tomcat-ssl-tests-props" /> <stop-jboss/> <wait-on-shutdown conf="tomcat-ssl"/> </target> @@ -827,37 +811,7 @@ </create-config> <start-jboss conf="tomcat-sso"/> <wait-on-host/> - <junit dir="${module.output}" - printsummary="${junit.printsummary}" - haltonerror="${junit.haltonerror}" - haltonfailure="${junit.haltonfailure}" - fork="${junit.fork}" - timeout="${junit.timeout}" - jvm="${junit.jvm}"> - - <jvmarg value="${junit.jvm.options}"/> - <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> - <sysproperty key="build.testlog" value="${build.testlog}"/> - <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="tests.classpath"/> - </classpath> - - <formatter type="xml" usefile="${junit.formatter.usefile}"/> - - <batchtest todir="${build.reports}" - haltonerror="${junit.batchtest.haltonerror}" - haltonfailure="${junit.batchtest.haltonfailure}" - fork="${junit.batchtest.fork}"> - - <fileset dir="${build.classes}"> - <patternset refid="tc-sso.includes"/> - </fileset> - </batchtest> - </junit> + <run-junit junit.patternset="tc-sso.includes" /> <stop-jboss/> <wait-on-shutdown conf="tomcat-sso"/> </target> @@ -1124,6 +1078,7 @@ </and> </waitfor> <fail message="Timeout waiting for binding-manager2 to start" if="cluster.timeout"/> + <run-junit junit.patternset="binding-manager.includes" /> <stop-jboss url="jnp://localhost:1299"/> <stop-jboss url="jnp://localhost:1199"/> </target> @@ -1141,55 +1096,15 @@ <include name="lib/**"/> </patternset> </create-config> -<!-- <start-jboss-os conf="jrmp-invoker"/>--> <start-jboss conf="jrmp-invoker"/> <wait-on-host/> - <antcall target="jrmp-invoker-unit-tests"> - <param name="jboss-junit-configuration" value="JRMP-Invoker"/> - </antcall> + <run-junit junit.patternset="jrmp-invoker.includes" + junit.configuration="JRMP-Invoker" /> <stop-jboss/> </target> - <target name="jrmp-invoker-unit-tests"> - <junit dir="${module.output}" - printsummary="${junit.printsummary}" - haltonerror="${junit.haltonerror}" - haltonfailure="${junit.haltonfailure}" - fork="${junit.fork}" - timeout="${junit.timeout}" - jvm="${junit.jvm}"> - - <jvmarg value="${junit.jvm.options}"/> - <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> - <sysproperty key="build.testlog" value="${build.testlog}"/> - <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="tests.classpath"/> - </classpath> - - <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" - usefile="${junit.formatter.usefile}" - extension="-${jboss-junit-configuration}.xml"/> - - <batchtest todir="${build.reports}" - haltonerror="${junit.batchtest.haltonerror}" - haltonfailure="${junit.batchtest.haltonfailure}" - fork="${junit.batchtest.fork}"> - - <fileset dir="${build.classes}"> - <patternset refid="jrmp-invoker.includes"/> - </fileset> - </batchtest> - </junit> - - </target> - <!-- | Tests DeploymentService --> |