From: Thomas D. <tho...@jb...> - 2005-07-20 08:32:44
|
User: tdiesler Date: 05/07/20 04:31:42 Modified: jbosstest build.xml Log: Add tests-webservice-ssl to all-tests Revision Changes Path 1.479 +76 -72 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.478 retrieving revision 1.479 diff -u -b -r1.478 -r1.479 --- build.xml 19 Jul 2005 15:09:49 -0000 1.478 +++ build.xml 20 Jul 2005 08:31:42 -0000 1.479 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.478 2005/07/19 15:09:49 aloubyansky Exp $ --> +<!-- $Id: build.xml,v 1.479 2005/07/20 08:31:42 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -439,6 +439,16 @@ </sequential> </macrodef> + <!-- patternsets for specialized configs --> + <patternset id="apache_tomcat.cluster.includes"> + <include name="org/jboss/test/cluster/apache_tomcat/*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> <!-- patternsets for that require clustering to be enabled --> <patternset id="cluster.includes"> <include name="org/jboss/test/cluster/test/*TestCase.class"/> @@ -448,13 +458,70 @@ <exclude name="org/jboss/test/cluster/test/*TestCase.class"/> <exclude name="org/jboss/test/testbeancluster/test/*TestCase.class"/> </patternset> - <patternset id="apache_tomcat.cluster.includes"> - <include name="org/jboss/test/cluster/apache_tomcat/*TestCase.class"/> + <!-- The compatibility tests need extra memory --> + <patternset id="compatibility.includes"> + <include name="org/jboss/test/compatibility/test/*TestCase.class"/> + </patternset> + <patternset id="compatibility.excludes"> + <exclude name="org/jboss/test/compatibility/test/*TestCase.class"/> + </patternset> + <!-- Tests needing deployment service setup --> + <patternset id="deployment-service.includes"> + <include name="org/jboss/test/deployment/test/*TestCase.class"/> + </patternset> + <patternset id="deployment-service.excludes"> + <exclude name="org/jboss/test/deployment/test/*TestCase.class"/> </patternset> <patternset id="ha.includes"> <include name="org/jboss/test/ha/jmx/test/*TestCase.class"/> <include name="org/jboss/test/ha/singleton/test/*TestCase.class"/> </patternset> + <!-- Tests needing IIOP setup --> + <patternset id="iiop.includes"> + <include name="org/jboss/test/*iiop/test/*TestCase.class"/> + </patternset> + <patternset id="iiop.excludes"> + <exclude name="org/jboss/test/*iiop/test/*"/> + </patternset> + <!-- A patternset that requires jboss to run with a JACC security manager --> + <patternset id="jacc.includes"> + <include name="**/test/jacc/test/*TestCase.class"/> + </patternset> + <patternset id="jacc.excludes"> + <exclude name="**/test/jacc/test/*"/> + </patternset> + <patternset id="jaxr.includes"> + <include name="org/jboss/test/jaxr/scout/**/*TestCase.class"/> + </patternset> + <!-- Tests needing xml binding setup --> + <patternset id="jbossxb.includes"> + <include name="org/jboss/test/xml/*TestCase.class"/> + </patternset> + <patternset id="jbossxb.excludes"> + <exclude name="org/jboss/test/xml/*TestCase.class"/> + </patternset> + <!-- Tests needing jrmp invoker --> + <patternset id="jrmp-invoker.includes"> + <include name="org/jboss/test/cts/test/BmpUnitTestCase.class"/> + <!--include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/--> + <include name="org/jboss/test/cts/test/CmpUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/CtsCmp2UnitTestCase.class"/> + <include name="org/jboss/test/cts/test/IndependentJarsUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/LocalEjbTestCase.class"/> + <include name="org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.class"/> + <!--include name="org/jboss/test/cts/test/MDBInvoker.class"/--> + <!--include name="org/jboss/test/cts/test/MDBUnitTestCase.class"/--> + <!--include name="org/jboss/test/cts/test/SessionInvoker.class"/--> + <include name="org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/StatelessSessionStressTestCase.class"/> + <include name="org/jboss/test/cts/test/StatelessSessionUnitTestCase.class"/> + <include name="org/jboss/test/bank/test/BankEJB20StressTestCase.class"/> + <include name="org/jboss/test/testbean/test/BeanUnitTestCase.class"/> + </patternset> + <patternset id="jrmp-invoker.excludes"> + <exclude name="org/jboss/test/bank/test/*"/> + </patternset> <!-- A patternset for that require a security config --> <patternset id="security.includes"> <include name="**/test/naming/test/Security*"/> @@ -481,12 +548,8 @@ <patternset id="securitymgr.excludes"> <exclude name="**/test/securitymgr/test/*"/> </patternset> - <!-- A patternset that requires jboss to run with a JACC security manager --> - <patternset id="jacc.includes"> - <include name="**/test/jacc/test/*TestCase.class"/> - </patternset> - <patternset id="jacc.excludes"> - <exclude name="**/test/jacc/test/*"/> + <patternset id="stax.include"> + <include name="org/jboss/test/stax/**/*TestCase.class"/> </patternset> <!-- Tests needing non-clustered tomcat SSO --> <patternset id="tc-sso.includes"> @@ -509,68 +572,8 @@ <patternset id="tc-ssl.excludes"> <exclude name="org/jboss/test/web/test/ssl/*"/> </patternset> - <!-- Tests needing IIOP setup --> - <patternset id="iiop.includes"> - <include name="org/jboss/test/*iiop/test/*TestCase.class"/> - </patternset> - <patternset id="iiop.excludes"> - <exclude name="org/jboss/test/*iiop/test/*"/> - </patternset> - <!-- Tests needing jrmp invoker --> - <patternset id="jrmp-invoker.includes"> - <include name="org/jboss/test/cts/test/BmpUnitTestCase.class"/> -<!-- <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/>--> - <include name="org/jboss/test/cts/test/CmpUnitTestCase.class"/> - <include name="org/jboss/test/cts/test/CtsCmp2UnitTestCase.class"/> - <include name="org/jboss/test/cts/test/IndependentJarsUnitTestCase.class"/> - <include name="org/jboss/test/cts/test/LocalEjbTestCase.class"/> - <include name="org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.class"/> -<!-- <include name="org/jboss/test/cts/test/MDBInvoker.class"/>--> -<!-- <include name="org/jboss/test/cts/test/MDBUnitTestCase.class"/>--> -<!-- <include name="org/jboss/test/cts/test/SessionInvoker.class"/>--> - <include name="org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.class"/> - <include name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.class"/> - <include name="org/jboss/test/cts/test/StatelessSessionStressTestCase.class"/> - <include name="org/jboss/test/cts/test/StatelessSessionUnitTestCase.class"/> - <include name="org/jboss/test/bank/test/BankEJB20StressTestCase.class"/> - <include name="org/jboss/test/testbean/test/BeanUnitTestCase.class"/> - </patternset> - <patternset id="jrmp-invoker.excludes"> - <exclude name="org/jboss/test/bank/test/*"/> - </patternset> - <!-- Tests needing xml binding setup --> - <patternset id="jbossxb.includes"> - <include name="org/jboss/test/xml/*TestCase.class"/> - </patternset> - <patternset id="jbossxb.excludes"> - <exclude name="org/jboss/test/xml/*TestCase.class"/> - </patternset> - <patternset id="jaxr.includes"> - <include name="org/jboss/test/jaxr/scout/**/*TestCase.class"/> - </patternset> - <patternset id="stax.include"> - <include name="org/jboss/test/stax/**/*TestCase.class"/> - </patternset> - <!-- Tests needing deployment service setup --> - <patternset id="deployment-service.includes"> - <include name="org/jboss/test/deployment/test/*TestCase.class"/> - </patternset> - <patternset id="deployment-service.excludes"> - <exclude name="org/jboss/test/deployment/test/*TestCase.class"/> - </patternset> - <!-- The compatibility tests need extra memory --> - <patternset id="compatibility.includes"> - <include name="org/jboss/test/compatibility/test/*TestCase.class"/> - </patternset> - <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 id="webservice-ssl.includes"> + <include name="org/jboss/test/webservice/secure/*TestCase.class"/> </patternset> <!-- Tests that are currently broken --> @@ -627,6 +630,7 @@ <antcall target="tests-jacc-security"/> <antcall target="tests-jacc-securitymgr"/> <antcall target="tests-compatibility"/> + <antcall target="tests-webservice-ssl"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -2203,7 +2207,7 @@ </target> - <target name="webservice-ssl-tests" + <target name="tests-webservice-ssl" description="Tomcat tests requiring an SSL connector"> <!-- Create the ssl enabled tomcat config --> <create-config baseconf="default" newconf="webservice-ssl"> |