[jboss-cvs] JBossRemoting ...
Ron Sigal
ron_sigal at yahoo.com
Sat May 19 02:47:30 EDT 2007
User: rsigal
Date: 07/05/19 02:47:30
Modified: JBossRemoting Tag: remoting_2_x build.xml
Log:
JBREM-714: Modified versioning tests.
Revision Changes Path
No revision
No revision
1.88.2.14 +285 -77 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
retrieving revision 1.88.2.14
diff -u -b -r1.88.2.13 -r1.88.2.14
--- build.xml 20 Mar 2007 03:18:44 -0000 1.88.2.13
+++ build.xml 19 May 2007 06:47:29 -0000 1.88.2.14
@@ -9,7 +9,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.88.2.13 2007/03/20 03:18:44 telrod Exp $ -->
+<!-- $Id: build.xml,v 1.88.2.14 2007/05/19 06:47:29 rsigal Exp $ -->
<project default="most" name="JBossRemoting">
@@ -34,9 +34,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.0.GA"/>
+ <property name="module.version" value="2.4.0.Beta1"/>
<!-- extension is for the file suffix to use for distribution build -->
- <property name="module.version.extension" value="2_2_0_GA"/>
+ <property name="module.version.extension" value="2_4_0_Beta1"/>
<property name="implementation.url" value="http://www.jboss.org/products/remoting"/>
<property name="root.dir" value="${basedir}"/>
@@ -279,6 +279,8 @@
<include name="org/jboss/**/*.xml"/>
<!-- Include keys -->
<include name="org/jboss/**/*.key"/>
+ <!-- Include XMl schemas -->
+ <include name="connector.xsd"/>
</fileset>
</jar>
@@ -944,50 +946,115 @@
<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"/>
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
</antcall>
+
+ <!-- ******************************************************************************** -->
+ <!-- Current <- -> 2.0.0 -->
<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="jboss.remoting.pre_2_0_compatible" value="false"/>
+ <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_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="jboss.remoting.pre_2_0_compatible" value="false"/>
+ <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>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_4-client"/>
- <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_4/jboss-remoting.jar"/>
+ <!-- ******************************************************************************** -->
+ <!-- Current <- -> 1.4.6.GA -->
+ <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="jboss.remoting.pre_2_0_compatible" value="true"/>
+ <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=""/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_4-server"/>
- <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_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="jboss.remoting.pre_2_0_compatible" value="true"/>
+ <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.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_3-client"/>
- <param name="client.classpath" value="${etc.dir}/lib/remoting_1_4_3/jboss-remoting.jar"/>
+ <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_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="jboss.remoting.pre_2_0_compatible" value="true"/>
+ <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=""/>
</antcall>
- <antcall target="tests.versioning.all_transports" inheritrefs="true">
- <param name="jboss-junit-configuration" value="1_4_3-server"/>
- <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_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="jboss.remoting.pre_2_0_compatible" value="true"/>
+ <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 -->
+ <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=""/>
+ </antcall>
+
+ <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=""/>
+ </antcall>
+
+ <antcall target="tests.versioning.socket" inheritrefs="true">
+ <param name="version" value="1_4_3_GA"/>
+ </antcall>
</target>
<!-- This runs all the versioning tests against 2.x only -->
@@ -1040,6 +1107,7 @@
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"/>
@@ -1047,7 +1115,39 @@
</classpath>
<jvmarg value="-Dclient.path=${client.classpath}"/>
<jvmarg value="-Dserver.path=${server.classpath}"/>
- <jvmarg value="-Djboss.remoting.pre_2_0_compatible=${jboss.remoting.pre_2_0_compatible}"/>
+ <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="-Dremoting.metadata=check_connection=${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/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </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"/>
@@ -1055,6 +1155,114 @@
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.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=""/>
+ <param name="server.check_connection" value="true"/>
+ </antcall>
+
+ <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}-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=""/>
+ </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>
+
+ <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>
More information about the jboss-cvs-commits
mailing list