Author: ron.sigal(a)jboss.com Date: 2010-02-21 09:55:08 -0500 (Sun, 21 Feb 2010) New Revision: 5743 Modified: remoting2/branches/2.2/build.xml Log: JBREM-1186: Added 2.2.3.SP1 to versioning tests; JBREM-1187: updated version to 2.2.3.SP2; improved one-test target. Modified: remoting2/branches/2.2/build.xml =================================================================== --- remoting2/branches/2.2/build.xml 2010-02-21 14:52:47 UTC (rev 5742) +++ remoting2/branches/2.2/build.xml 2010-02-21 14:55:08 UTC (rev 5743) @@ -1,14 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +--> -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - <!-- $Id$ --> <project default="most" name="JBossRemoting"> @@ -71,9 +83,9 @@ <!-- Module name(s) & version --> <property name="module.name" value="remoting"/> <property name="module.Name" value="JBoss Remoting"/> - <property name="module.version" value="2.2.3.SP1"/> + <property name="module.version" value="2.2.3.SP2"/> <!-- extension is for the file suffix to use for distribution build --> - <property name="module.version.extension" value="2_2_3_SP1"/> + <property name="module.version.extension" value="2_2_3_SP2"/> <property name="implementation.url" value="http://www.jboss.org/products/remoting"/> <property name="root.dir" value="${basedir}"/> @@ -573,9 +585,10 @@ <!-- ================================================================== --> <!-- 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}"/> - <junit printsummary="true" fork="yes" includeantruntime="true"> + <mkdir dir="${output.tests.tmp}"/> + <junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}"> <classpath> <path refid="tests.classpath"/> <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/> @@ -583,11 +596,48 @@ <!-- 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="jars, tests.jars"> <antcall target="tests.functional.core" inheritrefs="true"/> <!--<antcall target="tests.versioning" inheritrefs="true"/>--> @@ -1619,6 +1669,29 @@ </antcall> <!-- ******************************************************************************** --> + <!-- Current <- -> 2.2.3.SP1 --> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_2_3_SP1-client"/> + <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_3_SP1/jboss-remoting.jar"/> + <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/> + <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" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_2_3_SP1-server"/> + <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_3_SP1/jboss-remoting.jar"/> + <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/> + <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"/> + </antcall> + + <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.3 --> <antcall target="tests.versioning.all_transports" inheritrefs="true"> <param name="jboss-junit-configuration" value="2_2_3-client"/>