[jboss-remoting-commits] JBoss Remoting SVN: r5854 - remoting2/branches/2.x.

Author: ron.sigal(a)jboss.com Date: 2010-05-10 20:40:49 -0400 (Mon, 10 May 2010) New Revision: 5854 Modified: remoting2/branches/2.x/build.xml Log: JBREM-1222: Added 2.5.2.SP2 to versioning tests; JBREM-1223: updated version to 2.5.2.SP3. Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2010-05-09 20:20:39 UTC (rev 5853) +++ remoting2/branches/2.x/build.xml 2010-05-11 00:40:49 UTC (rev 5854) @@ -225,9 +225,9 @@ <!-- Module name(s) & version --> <property name="module.name" value="remoting"/> <property name="module.Name" value="JBoss Remoting"/> - <property name="module.version" value="2.5.2.SP2"/> + <property name="module.version" value="2.5.2.SP3"/> <!-- extension is for the file suffix to use for dtribution build --> - <property name="module.version.extension" value="2_5_2_SP2"/> + <property name="module.version.extension" value="2_5_2_SP3"/> <property name="implementation.url" value="http://www.jboss.org/products/remoting"/> <property name="root.dir" value="${basedir}"/> @@ -807,9 +807,9 @@ <!-- ================================================================== --> <!-- Tests --> <!-- ================================================================== --> - <target name="one-test" if="test" description="Execute a single test." depends="jars, tests.jars"> + <target name="one-test-old" if="test" description="Execute a single test." depends="jars, tests.jars"> <mkdir dir="${output.tests.results}"/> - <mkdir dir="${output.tests.tmp}"/> + <mkdir dir="${output.tests.tmp}"/> <junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}"> <classpath> <path refid="tests.classpath"/> @@ -818,10 +818,46 @@ <!-- 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"/> - <test fork="yes" todir="${output.tests.results}" name="${test}"/> + <test fork="yes" todir="${output.tests.results}" name="**/*${test}*"/> </junit> <antcall target="tests.report.quick"/> </target> + + <target name="one-test" depends="tests.jars"> + <junit + printsummary="true" fork="yes" includeantruntime="true" + tempdir="${output.tests.tmp}" maxmemory="1024m"> + <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> + <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> + <classpath> + <path refid="tests.classpath"/> + </classpath> + <sysproperty key="${java.security.manager.key}" value="${java.security.manager}"/> + <sysproperty key="java.security.policy" value="${java.security.policy}"/> + <sysproperty key="java.security.debug" value="${java.security.debug}"/> + <sysproperty key="build.home" value="${basedir}"/> + <sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/> + <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}"/> + <sysproperty key="jrunit.receive_on_all_interfaces" value="${receiveOnAllInterfaces}"/> + <sysproperty key="jrunit.send_on_all_interfaces" value="${sendOnAllInterfaces}"/> + <sysproperty key="jrunit.send_interfaces" value="${sendInterfaces}"/> + <sysproperty key="jrunit.logdir" value="${output.tests}"/> + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" + extension="-${jboss-junit-configuration}.xml"/> + <batchtest fork="yes" todir="${output.tests.results}" + haltonfailure="no"> + <fileset dir="${tests.compile.dir}"> + <include name="**/remoting/**/*${test}TestCase.class"/> + </fileset> + </batchtest> + </junit> + </target> <target name="tests" description="Runs remoting functional and performance tests." depends="tests.jars"> <antcall target="tests.functional.core" inheritrefs="true"/> @@ -2260,7 +2296,25 @@ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> <param name="check_content_type" value="true"/> </antcall> - + + <!-- ******************************************************************************** --> + <!-- Current <- -> 2.5.2.SP2 --> + <antcall target="download.version"> + <param name="version" value="2.5.2.SP2"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_5_2_SP2-client"/> + <param name="client.classpath" value="${etc.dir}/lib/2.5.2.SP2/jboss-remoting.jar${extended.classpath}"/> + <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="check_content_type" value="true"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_5_2_SP2-server"/> + <param name="server.classpath" value="${etc.dir}/lib/2.5.2.SP2/jboss-remoting.jar${extended.classpath}"/> + <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="check_content_type" value="true"/> + </antcall> + <!-- ******************************************************************************** --> <!-- Current <- -> 2.5.2 --> <antcall target="download.version"> @@ -2388,6 +2442,33 @@ </antcall> <!-- ******************************************************************************** --> + <!-- Current <- -> 2.2.3.SP2 --> + <antcall target="download.version"> + <param name="version" value="2.2.3.SP2-brew"/> + </antcall> + <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_2_3_SP2_client"/> + <param name="client.classpath" value="${etc.dir}/lib/2.2.3.SP2-brew/jboss-remoting.jar${old.extended.classpath}"/> + <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="client.pre_2_0_compatible" value=""/> + <param name="server.pre_2_0_compatible" value=""/> + <param name="client.version" value=""/> + <param name="server.version" value="2"/> + <param name="check_connection" value="false"/> + </antcall> + <antcall target="tests.versioning.all_transports_pre_2.4" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_2_3_SP2-server"/> + <param name="server.classpath" value="${etc.dir}/lib/2.2.3.SP2-brew/jboss-remoting.jar${old.extended.classpath}"/> + <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="client.pre_2_0_compatible" value=""/> + <param name="server.pre_2_0_compatible" value=""/> + <param name="client.version" value="2"/> + <param name="server.version" value=""/> + <param name="check_connection" value="false"/> + <param name="check_content_type" value="true"/> + </antcall> + + <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.3.SP1 --> <antcall target="download.version"> <param name="version" value="2.2.3.SP1"/>