From: Scott S. <sco...@jb...> - 2005-05-02 01:24:14
|
User: starksm Date: 05/05/01 21:23:58 Modified: jbosstest build.xml Log: Merge some change from 4.0 Revision Changes Path 1.454 +204 -23 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.453 retrieving revision 1.454 diff -u -b -r1.453 -r1.454 --- build.xml 28 Apr 2005 23:31:30 -0000 1.453 +++ build.xml 2 May 2005 01:23:58 -0000 1.454 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.453 2005/04/28 23:31:30 adrian Exp $ --> +<!-- $Id: build.xml,v 1.454 2005/05/02 01:23:58 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -226,8 +226,8 @@ <property name="jbosstest.threadcount" value="5"/> <property name="jbosstest.beancount" value="5"/> <property name="jbosstest.nodeploy" value="false"/> + <property name="jbosstest.src.etc" value="${source.etc}"/> <property name="junit.batchtest.todir" value="${build.reports}"/> - <property name="junit.jvm.options" value="-Ddummy"/> <!-- Override JUnit Marathon defaults --> <property name="marathon.timeout" value="3900000"/> <!-- 65 minutes --> @@ -350,6 +350,8 @@ <!-- Import the jboss server run targets --> <import file="imports/server-config.xml"/> + <!-- Propagate the dist directory as a jbosstest system property --> + <property name="jbosstest.dist" value="${jboss.dist}"/> <!-- ================================================================== --> <!-- Cleaning --> @@ -442,6 +444,7 @@ <patternset id="security.includes"> <include name="**/test/naming/test/Security*"/> <include name="**/test/security/test/*UnitTestCase.class"/> + <include name="**/test/jca/test/SecurityContextUnitTestCase.class"/> <include name="**/test/jmx/test/Secure*TestCase.class"/> <include name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/> <include name="**/test/perf/test/SecurePerfStressTestCase.class"/> @@ -450,6 +453,7 @@ <patternset id="security.excludes"> <exclude name="**/test/naming/test/Security*"/> <exclude name="**/test/security/test/*UnitTestCase.class"/> + <exclude name="**/test/jca/test/SecurityContextUnitTestCase.class"/> <exclude name="**/test/jmx/test/Secure*"/> <exclude name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/> <exclude name="**/test/perf/test/SecurePerfStressTestCase.class"/> @@ -539,6 +543,13 @@ <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> <!-- Tests that are currently broken --> <patternset id="badtest.excludes"> @@ -563,6 +574,7 @@ <patternset refid="iiop.excludes"/> <patternset refid="jbossxb.excludes"/> <patternset refid="deployment-service.excludes"/> + <patternset refid="compatibility.excludes"/> </patternset> <!-- A target that allows for conditional dependency on the compilation and @@ -588,8 +600,10 @@ <antcall target="tomcat-ssl-tests"/> <antcall target="tomcat-sso-tests"/> <antcall target="tomcat-sso-clustered-tests"/> + <antcall target="test-example-binding-manager"/> <antcall target="tests-jacc-security"/> - <antcall target="jrmp-invoker-tests"/> + <antcall target="tests-jacc-securitymgr"/> + <antcall target="tests-compatibility"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -788,6 +802,7 @@ </batchtest> </junit> <stop-jboss/> + <wait-on-shutdown conf="tomcat-ssl"/> </target> <!-- Tests of tomcat requiring SSO configured @@ -843,11 +858,11 @@ </batchtest> </junit> <stop-jboss/> + <wait-on-shutdown conf="tomcat-sso"/> </target> <target name="tomcat-sso-clustered-tests" - description="Tomcat tests requiring clustered SSO configured" - depends="maybejars"> + description="Tomcat tests requiring clustered SSO configured"> <!-- Create the sso enabled tomcat config starting with the default config --> <create-config baseconf="all" newconf="tomcat-sso-cluster0" @@ -902,8 +917,36 @@ <stop-jboss url="${node0.jndi.url}"/> <stop-jboss url="${node1.jndi.url}"/> + <wait-on-shutdown conf="tomcat-sso-cluster0"/> + <wait-on-shutdown conf="tomcat-sso-cluster1"/> </target> + <target name="test-example-binding-manager" + description="Test the example binding configuration" + > + <create-all-cluster-node conf="binding-manager1" ports="ports-01"/> + <create-all-cluster-node conf="binding-manager2" ports="ports-02"/> + <start-jboss conf="binding-manager1"/> + <echo>Waiting for http://localhost:8180</echo> + <waitfor maxwait="300" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> + <and> + <http url="http://localhost:8180"/> + </and> + </waitfor> + <fail message="Timeout waiting for binding-manager1 to start" if="cluster.timeout"/> + <start-jboss conf="binding-manager2"/> + <echo>Waiting for http://localhost:8280</echo> + <waitfor maxwait="300" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> + <and> + <http url="http://localhost:8280"/> + </and> + </waitfor> + <fail message="Timeout waiting for binding-manager2 to start" if="cluster.timeout"/> + <stop-jboss url="jnp://localhost:1299"/> + <stop-jboss url="jnp://localhost:1199"/> + </target> <!-- | Tests ejb calls using the jrmp invoker @@ -1001,6 +1044,7 @@ <param name="jboss-junit-configuration" value="DeploymentService"/> </antcall> <stop-jboss/> + <wait-on-shutdown conf="deployment-service"/> </target> <target name="deployment-service-unit-tests"> @@ -1045,7 +1089,7 @@ | server distribution build. --> - <target name="tests-standard-unit" depends="maybejars"> + <target name="tests-standard-unit"> <echo><![CDATA[ junit.timeout: ${junit.timeout} jbosstest.iterationcount: ${jbosstest.iterationcount} @@ -1095,7 +1139,7 @@ </junit> </target> - <target name="tests-standard-stress" depends="maybejars"> + <target name="tests-standard-stress"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1136,7 +1180,7 @@ </junit> </target> - <target name="tests-clustering-unit" depends="maybejars"> + <target name="tests-clustering-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1206,7 +1250,7 @@ <stop-cluster/> </target> - <target name="tests-ha-unit" depends="maybejars"> + <target name="tests-ha-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1252,7 +1296,7 @@ | jar rather than the build.classes.dir. Typically these tests need to | control how classes are loaded. --> - <target name="tests-client-unit" depends="maybejars"> + <target name="tests-client-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1303,7 +1347,7 @@ | Standard security tests that should run successfully against a default | JBoss server distribution build. --> - <target name="tests-security-basic-unit" depends="maybejars"> + <target name="tests-security-basic-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1411,6 +1455,7 @@ </junit> <stop-jboss/> + <wait-on-shutdown conf="default"/> </target> <!-- Tests of the JACC security implementation --> @@ -1425,10 +1470,11 @@ <include name="deploy/ear-deployer.xml"/> <include name="deploy/ejb-deployer.xml"/> <include name="deploy/jmx-invoker-service.xml"/> + <include name="deploy/jmx-console.war/**"/> <include name="deploy/jbossjca-service.xml"/> <include name="deploy/jboss-local-jdbc.rar"/> <include name="deploy/mail-service.xml"/> - <include name="deploy/jms/*"/> + <include name="deploy/jms/**"/> <include name="lib/**"/> </patternset> </create-config> @@ -1492,9 +1538,95 @@ </junit> <stop-jboss/> + <wait-on-shutdown conf="jacc"/> + </target> + + <target name="tests-jacc-securitymgr" + description="Tests run against a jboss server with JACC configured + security manager"> + <!-- Create the ssl enabled tomcat config --> + <create-config baseconf="default" newconf="jacc"> + <patternset> + <include name="conf/**"/> + <include name="deploy/hsqldb-ds.xml"/> + <include name="deploy/jbossweb*.sar/**"/> + <include name="deploy/ear-deployer.xml"/> + <include name="deploy/ejb-deployer.xml"/> + <include name="deploy/jmx-invoker-service.xml"/> + <include name="deploy/jmx-console.war/**"/> + <include name="deploy/jbossjca-service.xml"/> + <include name="deploy/jboss-local-jdbc.rar"/> + <include name="deploy/mail-service.xml"/> + <include name="deploy/jms/*"/> + <include name="lib/**"/> + </patternset> + </create-config> + <start-securitymgr conf="jacc"/> + + <mkdir dir="${build.reports}"/> + <mkdir dir="${build.testlog}"/> + <waitfor maxwait="60" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> + <http url="http://localhost:8080/"/> + </waitfor> + <fail message="Timeout waiting for server to start" if="startup.timeout"/> + + + <junit dir="${module.output}" + printsummary="true" + haltonerror="false" + haltonfailure="false" + fork="true" + timeout="${junit.timeout}" + jvm="${junit.jvm}"> + + <jvmarg value="${junit.jvm.options}"/> + + <!-- + <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/client.policy"/> + <jvmarg value="-Djava.security.debug=access,failure"/> + --> + <sysproperty key="jboss.home" file="${project.root}"/> + <sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty"/> + <sysproperty key="jboss.tools.dir" file="${project.root}/tools"/> + <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> + <sysproperty key="jbosstest.secure" value="true"/> + <sysproperty key="jboss-junit-configuration" value="JACC+SecurityMgr"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> + <sysproperty key="java.security.auth.login.config" + value="${build.resources}/security/auth.conf"/> + <sysproperty key="build.testlog" value="${build.testlog}"/> + <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + + <classpath> + <pathelement location="${build.resources}"/> + <pathelement location="${build.classes}"/> + <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="false" + haltonfailure="false" + fork="true"> + + <fileset dir="${build.classes}"> + <patternset refid="jacc.includes"/> + </fileset> + </batchtest> + </junit> + + <stop-jboss/> + <wait-on-shutdown conf="jacc"/> </target> - <target name="tests-standalone-aop-unit" depends="maybejars"> + <target name="tests-standalone-aop-unit"> <!-- <antcall target="tests-treecacheaop-unit" inheritRefs="true"/> --> @@ -1502,6 +1634,53 @@ <antcall target="tests-baseaop-unit" inheritRefs="true"/> </target> + <target name="tests-compatibility" + description="Checks compatibility on SerialUUID" depends="init"> + <junit dir="${module.output}" + printsummary="${junit.printsummary}" + haltonerror="${junit.haltonerror}" + haltonfailure="${junit.haltonfailure}" + fork="true" + timeout="${junit.timeout}" + jvm="${junit.jvm}"> + + <jvmarg value="${junit.jvm.options}"/> + <jvmarg value="-XX:MaxPermSize=128m"/> + <jvmarg value="-Xmx196m"/> + <sysproperty key="jboss.dist" file="${jboss.dist}"/> + <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.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> + + <!-- This runs with a minimal classpath as the jboss classes need to + be loaded in a seperate class loader. + --> + <classpath> + <pathelement location="${build.classes}" /> + <pathelement location="${build.resources}" /> + <path refid="jboss.varia.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="compatibility.includes"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="tests-treecacheaop-unit" depends="init"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> @@ -1645,7 +1824,7 @@ | Standard Foe-Deployer tests that should run successfully against a default | JBoss server distribution build. --> - <target name="tests-foe-deployer-unit" depends="maybejars"> + <target name="tests-foe-deployer-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1695,7 +1874,7 @@ <!-- | JBossMX implementation tests that should run correctly. --> - <target name="tests-jbossmx-implementation" depends="maybejars"> + <target name="tests-jbossmx-implementation"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1736,7 +1915,7 @@ <!-- | JBossMX performance tests that should run correctly. --> - <target name="tests-jbossmx-performance" depends="maybejars"> + <target name="tests-jbossmx-performance"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1776,7 +1955,7 @@ <!-- | JBossMX compliance tests that should run correctly. --> - <target name="tests-jbossmx-compliance" depends="maybejars"> + <target name="tests-jbossmx-compliance"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1816,7 +1995,7 @@ <!-- | IIOP test cases that should run successfully --> - <target name="tests-iiop" depends="maybejars"> + <target name="tests-iiop"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -1870,7 +2049,7 @@ </target> <!-- Test the XML binding framework --> - <target name="tests-xml-unit" depends="maybejars"> + <target name="tests-xml-unit"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2004,7 +2183,7 @@ <!-- Test for JAXR under the Web Services Umbrella --> - <target name="tests-scout-jaxr" depends="maybejars"> + <target name="tests-scout-jaxr"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2070,7 +2249,7 @@ <!-- Test for JAXR under the Web Services Umbrella --> - <target name="tests-jaxr" depends="maybejars"> + <target name="tests-jaxr"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2206,6 +2385,7 @@ <jvmarg value="${junit.jvm.options}"/> <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-Dbind.address=${env.MYTESTIP_1}"/> <jvmarg value="-Djava.security.policy==${build.resources}/client.policy"/> <!-- Used for JGroups --> <jvmarg value="-Dbind.address=${node0}"/> @@ -2307,7 +2487,7 @@ <!-- | Run the JORAM JMS testsuite against JBossMQ --> - <target name="tests-objectweb-jms" depends="maybejars"> + <target name="tests-objectweb-jms"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <junit dir="${module.output}" @@ -2352,7 +2532,7 @@ | of the unit test using the test property, -Dtest=org.jboss.test.... | Here you specify the testcase class, not the directory --> - <target name="one-test" depends="init" if="test" + <target name="one-test" if="test" description="Execute a single test."> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> @@ -2373,6 +2553,7 @@ <!-- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>--> <!-- Used for JGroups --> <jvmarg value="-Dbind.address=${node0}"/> + <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/> <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"/> |