Author: ron.sigal(a)jboss.com
Date: 2008-08-10 19:36:32 -0400 (Sun, 10 Aug 2008)
New Revision: 4501
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-302, JBREM-1023: (1) tests.marshall now runs in linux; (2) tests.marshall now runs
with both java and jboss serialization.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2008-08-10 23:29:51 UTC (rev 4500)
+++ remoting2/branches/2.x/build.xml 2008-08-10 23:36:32 UTC (rev 4501)
@@ -860,6 +860,9 @@
<param name="jboss-junit-configuration"
value="java_serialization_security"/>
</antcall>
<antcall target="tests.marshall" inheritrefs="true">
+ <param name="remoting.metadata.key"
value="remoting.metadata"/>
+ <param name="metadata"
value="serializationtype=java"/>
+ <param name="jboss-junit-configuration"
value="java_serialization"/>
</antcall>
</target>
@@ -898,6 +901,11 @@
</antcall>
<antcall target="tests.nonserializable"
inheritrefs="true"/>
<antcall target="tests.functional.main.serialization.jboss"
inheritrefs="true"/>
+ <antcall target="tests.marshall" inheritrefs="true">
+ <param name="remoting.metadata.key"
value="remoting.metadata"/>
+ <param name="metadata"
value="serializationtype=jboss"/>
+ <param name="jboss-junit-configuration"
value="jboss_serialization"/>
+ </antcall>
</target>
@@ -1539,8 +1547,8 @@
<!-- End of socket serialization smoke tests -->
<!-- Tests dynamic, remote loading of marshaller/unmarshaller -->
- <target name="tests.marshall" if="os.windows">
- <echo>remote marshalling tests</echo>
+ <target name="tests.marshall">
+ <echo>remote marshalling tests: ${metadata}</echo>
<mkdir dir="${output.tests.results}"/>
<mkdir dir="${output.tests.tmp}"/>
<junit printsummary="true" fork="yes"
includeantruntime="true" tempdir="${output.tests.tmp}">
@@ -1549,6 +1557,7 @@
<path refid="tests.marshall.classpath"/>
<pathelement
location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
<sysproperty key="${java.security.manager.key}"
value="${java.security.manager}"/>
<sysproperty key="java.security.policy"
value="${java.security.policy.marshal}"/>
<sysproperty key="java.security.debug"
value="${java.security.debug}"/>
@@ -1557,6 +1566,7 @@
<sysproperty key="log4j.jar.dir"
value="${basedir}/lib/apache-log4j/lib"/>
<sysproperty key="log4j.config.dir"
value="${basedir}/src/etc"/>
<sysproperty key="ant.library.dir"
value="${ant.library.dir}"/>
+ <sysproperty key="jboss-junit-configuration"
value="${jboss-junit-configuration}"/>
<sysproperty key="jrunit.bind_addr"
value="${bind.address}"/>
<sysproperty key="jrunit.mcast_addr"
value="${multicast.address}"/>
<sysproperty key="jrunit.mcast_port"
value="${multicast.port}"/>
@@ -1566,10 +1576,10 @@
<sysproperty key="jrunit.logdir"
value="${output.tests}"/>
<!-- this is needed for the
remoting.marshall.dynamic.remote.MarshallerLoadingServer -->
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
- <formatter type="xml"/>
+ <formatter
classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-${jboss-junit-configuration}.xml"/>
<batchtest fork="yes" todir="${output.tests.results}"
haltonfailure="no">
- <formatter type="xml"/>
<fileset dir="${tests.compile.dir}">
<include
name="**/remoting/marshall/dynamic/remote/**/*TestCase.class"/>
<exclude name="**/remoting/**/performance/**"/>
Show replies by date