[Jboss-cvs] JBossAS SVN: r56062 - trunk/ejb3
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 18 09:37:18 EDT 2006
Author: wolfc
Date: 2006-08-18 09:37:14 -0400 (Fri, 18 Aug 2006)
New Revision: 56062
Modified:
trunk/ejb3/build-test.xml
Log:
added iiop tests
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2006-08-18 13:32:05 UTC (rev 56061)
+++ trunk/ejb3/build-test.xml 2006-08-18 13:37:14 UTC (rev 56062)
@@ -1606,6 +1606,19 @@
</jar>
</target>
+ <target name="wolfc"
+ description="Builds all jar files."
+ depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/wolfc.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/wolfc/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="scopedclassloader"
description="Builds all jar files."
depends="compile-classes">
@@ -2230,7 +2243,7 @@
</target>
<target name="iiop"
- description="Builds all jar files."
+ description="Builds iiop.jar."
depends="compile-classes">
<mkdir dir="${build.lib}"/>
@@ -2564,7 +2577,15 @@
</jar>
</target>
- <target name="jars" depends="mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader, circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ejbthree440, ejbthree454, aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency, securitydomain, enventry, jms/managed, naming, bmt, jca/inflowmdb, pool, jms, security, reference21_30, factory, dd/web, txexceptions, exception, dd/override, stateless, standalone-jar, dd/mdb, bank, dd, longlived, xmlcfg, hbm, pkg, regressionHHH275, entityexception, asynchronous, consumer, clusteredentity, secondary, stateful, service, lob,cache,initial,timer,benchmark,entity,joininheritance, singletable, tableperclass, dependent, mdb, manytomany, regression, composite, composite2, entitycallback, relationships, ssl, ssladvanced, clusteredsession, strictpool, jacc, localcall, interceptors, interceptors2, clientinterceptor"/>
+ <target name="jars" depends="mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
+ circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ejbthree440,
+ ejbthree454, ejbthree670, aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency, securitydomain, enventry,
+ jms/managed, naming, bmt, jca/inflowmdb, pool, jms, security, reference21_30, factory, dd/web, txexceptions,
+ exception, dd/override, stateless, standalone-jar, dd/mdb, bank, dd, longlived, xmlcfg, hbm, pkg, regressionHHH275,
+ entityexception, asynchronous, consumer, clusteredentity, secondary, stateful, service, lob, cache, initial,
+ timer, benchmark, entity, joininheritance, singletable, tableperclass, dependent, mdb, manytomany, regression,
+ composite, composite2, entitycallback, relationships, ssl, ssladvanced, clusteredsession, strictpool, jacc,
+ localcall, interceptors, interceptors2, iiop, clientinterceptor"/>
<target name="test" depends="init" if="test"
description="Execute all tests in the given test directory.">
@@ -2656,7 +2677,8 @@
</classpath>
<formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
+ <formatter type="xml" usefile="true" unless="test.extension"/>
+ <formatter type="xml" extension="-${test.extension}.xml" usefile="true" if="test.extension"/>
<batchtest todir="${build.reports}"
haltonerror="false"
@@ -2898,6 +2920,7 @@
<pathelement location="${module.output}/lib/embeddable/lib"/>
<pathelement location="${build.lib}/embeddable/standalone"/>
<pathelement location="${build.lib}/embeddable/standalone/standard"/>
+ <!-- TODO: deployment should take care of adding jars to classpath -->
<fileset dir="${build.lib}/embeddable/standalone">
<include name="*.jar"/>
</fileset>
@@ -3033,12 +3056,14 @@
<antcall target="jacc-test" inheritRefs="true"/>
<antcall target="clustered-tests" inheritRefs="true"/>
<antcall target="invoker-test" inheritRefs="true"/>
+ <antcall target="iiop-tests" inheritRefs="true"/>
</target>
<target name="no-start-jboss-tests" depends="init" description="Execute all tests">
<antcall target="standalone-tests" inheritRefs="true"/>
<antcall target="no-start-jboss-ejb-tests" inheritRefs="true"/>
<antcall target="no-start-jboss-entity-tests" inheritRefs="true"/>
+ <antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
</target>
<target name="standalone-tests" depends="init">
@@ -3076,6 +3101,9 @@
<param name="test" value="regression/ejbthree454"/>
</antcall>
<antcall target="test" inheritRefs="true">
+ <param name="test" value="regression/ejbthree670"/>
+ </antcall>
+ <antcall target="test" inheritRefs="true">
<param name="test" value="regression/salesforce7123"/>
</antcall>
<antcall target="test" inheritRefs="true">
@@ -3317,6 +3345,21 @@
</target>
+ <target name="clustered-test" depends="init">
+ <antcall target="tests-clustering-startup"/>
+ <antcall target="tests-clustering-wait"/>
+
+ <antcall target="test-with-jvmargs" inheritRefs="true">
+ <param name="jvmargs" value=""/>
+ <!--
+ <param name="jvmargs"
+ value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=/dt_socket,address=8787,server=n,suspend=n"/>
+ -->
+ </antcall>
+
+ <antcall target="tests-clustering-shutdown"/>
+ </target>
+
<target name="clustered-one-test" depends="init, clusteredsession, clusteredentity">
<!--
-->
@@ -3574,19 +3617,48 @@
<delete dir="${build.reports}"/>
</target>
- <target name="test-iiop" depends="init" if="test"
- description="Execute all tests in the given test directory.">
+ <target name="jacorb-test" depends="init" if="test"
+ description="Execute all tests in the given test directory using JacORB.">
<!--property name="debugFlags" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=y"/-->
<property name="debugFlags" value=""/>
<!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="${test}"/>
+ <param name="test.extension" value="jacorb"/>
<!-- using jacorb -->
<param name="jvmargs" value="${debugFlags} -Djava.security.manager -Djava.security.policy=${resources}/security/tst.policy -Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.iiop.csiv2.SASClientInitializer -DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root -Djacorb.log.default.verbosity=10 -Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
- <!-- using sun jdk
+ </antcall>
+ </target>
+
+ <target name="sunorb-test" depends="init" if="test"
+ description="Execute all tests in the given test directory using Sun ORB.">
+ <!--property name="debugFlags" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=y"/-->
+ <property name="debugFlags" value=""/>
+ <!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
+ <antcall target="test-with-jvmargs" inheritRefs="true">
+ <param name="test" value="${test}"/>
+ <param name="test.extension" value="sunorb"/>
+ <!-- using sun jdk -->
<param name="jvmargs" value="-Djava.security.manager -Djava.security.policy=${resources}/security/tst.policy -Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer -Dorg.omg.CORBA.ORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root"/>
- -->
</antcall>
</target>
+ <target name="iiop-tests" depends="init" description="Execute all tests">
+
+ <start-jboss conf="all" host="${node0}"/>
+ <wait-on-host/>
+
+ <antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
+
+ <stop-jboss/>
+ <wait-on-shutdown conf="all"/>
+ </target>
+
+ <target name="no-start-jboss-iiop-tests" depends="init" description="Execute all iiop tests">
+ <antcall target="jacorb-test" inheritRefs="true">
+ <param name="test" value="iiop"/>
+ </antcall>
+ <!-- TODO: call sunorb-test, but the report gets overwritten -->
+ </target>
+
</project>
More information about the jboss-cvs-commits
mailing list