[jboss-cvs] JBossRemoting ...
Ron Sigal
ron_sigal at yahoo.com
Wed Jun 6 00:26:36 EDT 2007
User: rsigal
Date: 07/06/06 00:26:36
Modified: JBossRemoting Tag: remoting_2_2_0_GA build.xml
Log:
JBREM-714: Added additional versioning tests.
Revision Changes Path
No revision
No revision
1.88.2.13.2.6 +241 -98 JBossRemoting/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/build.xml,v
retrieving revision 1.88.2.13.2.5
retrieving revision 1.88.2.13.2.6
diff -u -b -r1.88.2.13.2.5 -r1.88.2.13.2.6
--- build.xml 9 May 2007 09:07:19 -0000 1.88.2.13.2.5
+++ build.xml 6 Jun 2007 04:26:36 -0000 1.88.2.13.2.6
@@ -9,7 +9,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.88.2.13.2.5 2007/05/09 09:07:19 rsigal Exp $ -->
+<!-- $Id: build.xml,v 1.88.2.13.2.6 2007/06/06 04:26:36 rsigal Exp $ -->
<project default="most" name="JBossRemoting">
@@ -944,6 +944,9 @@
<target name="tests.versioning.all"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
+
+ <!-- ******************************************************************************** -->
+ <!-- Current <- -> Current -->
<antcall target="tests.versioning.all_transports" inheritrefs="true">
<param name="jboss-junit-configuration" value="${module.version.extension}"/>
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
@@ -951,9 +954,9 @@
</antcall>
<!-- ******************************************************************************** -->
- <!-- Current <- -> 2.0.0 -->
+ <!-- Current <- -> 2.0.0.GA -->
<antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="2_0_0-client"/>
+ <param name="jboss-junit-configuration" value="2_0_0_GA-client"/>
<param name="client.classpath" value="${etc.dir}/lib/remoting_2_0_0_GA/jboss-remoting.jar"/>
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
<param name="client.pre_2_0_compatible" value=""/>
@@ -963,7 +966,7 @@
<param name="check_connection" value="false"/>
</antcall>
<antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="2_0_0-server"/>
+ <param name="jboss-junit-configuration" value="2_0_0_GA-server"/>
<param name="server.classpath" value="${etc.dir}/lib/remoting_2_0_0_GA/jboss-remoting.jar"/>
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
<param name="client.pre_2_0_compatible" value=""/>
@@ -975,140 +978,137 @@
<!-- ******************************************************************************** -->
<!-- Current <- -> 1.4.6.GA -->
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_6_GA-client_check"/>
- <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_6_GA/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="true"/>
- <param name="client.version" value=""/>
- <param name="server.version" value=""/>
- <param name="check_connection" value="true"/>
- </antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_6_GA-client_nocheck"/>
+ <antcall target="tests.versioning.all_but_socket" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_6_GA-client"/>
<param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_6_GA/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="true"/>
<param name="client.version" value=""/>
<param name="server.version" value=""/>
- <param name="check_connection" value="false"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_G_GA-server_check"/>
+ <antcall target="tests.versioning.all_but_socket" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_6_GA-server"/>
<param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_6_GA/jboss-remoting.jar"/>
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
<param name="client.pre_2_0_compatible" value="true"/>
<param name="server.pre_2_0_compatible" value=""/>
<param name="client.version" value=""/>
<param name="server.version" value=""/>
- <param name="check_connection" value="true"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_G_GA-server_nocheck"/>
- <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_6_GA/jboss-remoting.jar"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
- <param name="client.pre_2_0_compatible" value="true"/>
- <param name="server.pre_2_0_compatible" value=""/>
- <param name="client.version" value=""/>
- <param name="server.version" value=""/>
- <param name="check_connection" value="false"/>
+
+ <antcall target="tests.versioning.socket" inheritrefs="true">
+ <param name="version" value="1_4_6_GA"/>
</antcall>
<!-- ******************************************************************************** -->
- <!-- Current <- -> 1.4.4 -->
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_4-client_check"/>
- <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_4/jboss-remoting.jar"/>
+ <!-- Current <- -> 1.4.4.GA -->
+ <antcall target="tests.versioning.all_but_socket" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_4_GA-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_4_GA/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="true"/>
<param name="client.version" value=""/>
<param name="server.version" value=""/>
- <param name="check_connection" value="true"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_4-client_nocheck"/>
- <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_4/jboss-remoting.jar"/>
+ <antcall target="tests.versioning.all_but_socket" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_4_GA-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_4_GA/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.pre_2_0_compatible" value="true"/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value=""/>
+ </antcall>
+
+ <antcall target="tests.versioning.socket" inheritrefs="true">
+ <param name="version" value="1_4_4_GA"/>
+ </antcall>
+
+ <!-- ******************************************************************************** -->
+ <!-- Current <- -> 1.4.3.GA -->
+ <antcall target="tests.versioning.all_but_socket" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_3_GA-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_3_GA/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="true"/>
<param name="client.version" value=""/>
<param name="server.version" value=""/>
- <param name="check_connection" value="false"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_4-server_check"/>
- <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_4/jboss-remoting.jar"/>
+ <antcall target="tests.versioning.all_but_socket" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_3_GA-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_3_GA/jboss-remoting.jar"/>
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
<param name="client.pre_2_0_compatible" value="true"/>
<param name="server.pre_2_0_compatible" value=""/>
<param name="client.version" value=""/>
<param name="server.version" value=""/>
- <param name="check_connection" value="true"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_4-server_nocheck"/>
- <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_4/jboss-remoting.jar"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
- <param name="client.pre_2_0_compatible" value="true"/>
- <param name="server.pre_2_0_compatible" value=""/>
- <param name="client.version" value=""/>
- <param name="server.version" value=""/>
- <param name="check_connection" value="false"/>
+ <antcall target="tests.versioning.socket" inheritrefs="true">
+ <param name="version" value="1_4_3_GA"/>
</antcall>
<!-- ******************************************************************************** -->
- <!-- Current <- -> 1.4.3 -->
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_3-client_check"/>
- <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_3/jboss-remoting.jar"/>
+ <!-- Current <- -> 1.4.0.final -->
+ <antcall target="tests.versioning.all_but_socket" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_0_final-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_0_final/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="true"/>
<param name="client.version" value=""/>
<param name="server.version" value=""/>
- <param name="check_connection" value="true"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_3-client_nocheck"/>
- <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_3/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="true"/>
+ <antcall target="tests.versioning.all_but_socket" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_4_0_final-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_0_final/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.pre_2_0_compatible" value="true"/>
+ <param name="server.pre_2_0_compatible" value=""/>
<param name="client.version" value=""/>
<param name="server.version" value=""/>
- <param name="check_connection" value="false"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_3-server_check"/>
- <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_3/jboss-remoting.jar"/>
- <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
- <param name="client.pre_2_0_compatible" value="true"/>
- <param name="server.pre_2_0_compatible" value=""/>
+ <!-- 1.4.0.final does not allow turning off socket connection check -->
+ <antcall target="tests.versioning.socket.1.4.0" inheritrefs="true">
+ <param name="version" value="1_4_0_final"/>
+ </antcall>
+
+ <!-- ******************************************************************************** -->
+ <!-- Current <- -> 1.2.1.final -->
+ <!-- Compatibility is not guaranteed with 1.2.1.final
+
+ <antcall target="tests.versioning.all_but_socket" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_2_1_final-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_1_2_1_final/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="true"/>
<param name="client.version" value=""/>
<param name="server.version" value=""/>
- <param name="check_connection" value="true"/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_3-server_nocheck"/>
- <param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_3/jboss-remoting.jar"/>
+ <antcall target="tests.versioning.all_but_socket" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="1_2_1_final-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_1_2_1_final/jboss-remoting.jar"/>
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
<param name="client.pre_2_0_compatible" value="true"/>
<param name="server.pre_2_0_compatible" value=""/>
<param name="client.version" value=""/>
<param name="server.version" value=""/>
- <param name="check_connection" value="false"/>
</antcall>
+ <antcall target="tests.versioning.socket.1.4.0" inheritrefs="true">
+ <param name="version" value="1_2_1_final"/>
+ </antcall>
+ -->
</target>
<!-- This runs all the versioning tests against 2.x only -->
@@ -1186,6 +1186,149 @@
</junit>
</target>
+ <target name="tests.versioning.all_but_socket"
+ description="Runs remoting fuctional tests with different remoting versions for client and server."
+ depends="jars, tests.jars">
+ <mkdir dir="${output.tests.results}"/>
+ <echo>Running: ${jboss-junit-configuration}</echo>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <classpath>
+ <path refid="third_party.classpath"/>
+ <path refid="tests.version.classpath"/>
+ </classpath>
+ <jvmarg value="-Dclient.path=${client.classpath}"/>
+ <jvmarg value="-Dserver.path=${server.classpath}"/>
+ <jvmarg value="-Dclient.version=${client.version}"/>
+ <jvmarg value="-Dserver.version=${server.version}"/>
+ <jvmarg value="-Dclient.pre_2_0_compatible=${client.pre_2_0_compatible}"/>
+ <jvmarg value="-Dserver.pre_2_0_compatible=${server.pre_2_0_compatible}"/>
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <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/versioning/transport/**/*TestCase.class"/>
+ <exclude name="**/socket/**"/>
+ <exclude name="**/multiplex/**"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="tests.versioning.socket"
+ description="Runs remoting fuctional tests with different remoting versions for client and server."
+ depends="jars, tests.jars">
+
+ <antcall target="tests.versioning.socket.1.4.0" inheritrefs="true"/>
+
+ <antcall target="tests.versioning.socket.sub" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="${version}-client_nocheck"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/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="true"/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value=""/>
+ <param name="client.check_connection" value="false"/>
+ <param name="server.check_connection" value="false"/>
+ </antcall>
+
+ <antcall target="tests.versioning.socket.sub" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="${version}-server_nocheck"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.pre_2_0_compatible" value="true"/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value=""/>
+ <param name="client.check_connection" value="false"/>
+ <param name="server.check_connection" value="false"/>
+ </antcall>
+ </target>
+
+ <target name="tests.versioning.socket.1.4.0"
+ description="Runs remoting fuctional tests with different remoting versions for client and server."
+ depends="jars, tests.jars">
+ <antcall target="tests.versioning.socket.sub" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="${version}-client_check"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/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="true"/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value=""/>
+ <param name="client.check_connection" value="true"/>
+ <param name="server.check_connection" value="true"/>
+ </antcall>
+
+ <antcall target="tests.versioning.socket.sub" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="${version}-client_default"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/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="true"/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value=""/>
+ <param name="client.check_connection" value=""/>
+ <param name="server.check_connection" value=""/>
+ </antcall>
+
+ <antcall target="tests.versioning.socket.sub" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="${version}-server_check"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.pre_2_0_compatible" value="true"/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value=""/>
+ <param name="client.check_connection" value="true"/>
+ <param name="server.check_connection" value="true"/>
+ </antcall>
+
+ <antcall target="tests.versioning.socket.sub" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="${version}-server_default"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="client.pre_2_0_compatible" value="true"/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value=""/>
+ <param name="client.check_connection" value=""/>
+ <param name="server.check_connection" value=""/>
+ </antcall>
+ </target>
+
+ <target name="tests.versioning.socket.sub"
+ description="Runs remoting fuctional tests with different remoting versions for client and server."
+ depends="jars, tests.jars">
+ <mkdir dir="${output.tests.results}"/>
+ <echo>Running: ${jboss-junit-configuration}</echo>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <classpath>
+ <path refid="third_party.classpath"/>
+ <path refid="tests.version.classpath"/>
+ </classpath>
+ <jvmarg value="-Dclient.path=${client.classpath}"/>
+ <jvmarg value="-Dserver.path=${server.classpath}"/>
+ <jvmarg value="-Dclient.version=${client.version}"/>
+ <jvmarg value="-Dserver.version=${server.version}"/>
+ <jvmarg value="-Dclient.pre_2_0_compatible=${client.pre_2_0_compatible}"/>
+ <jvmarg value="-Dserver.pre_2_0_compatible=${server.pre_2_0_compatible}"/>
+ <jvmarg value="-Dclient.check_connection=${client.check_connection}"/>
+ <jvmarg value="-Dserver.check_connection=${server.check_connection}"/>
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <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/versioning/transport/**/socket/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="tests.versioning.no_multiplex"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
More information about the jboss-cvs-commits
mailing list