[jboss-cvs] JBossRemoting ...
Ron Sigal
ron_sigal at yahoo.com
Tue Oct 23 21:00:08 EDT 2007
User: rsigal
Date: 07/10/23 21:00:08
Modified: JBossRemoting Tag: remoting_2_x build.xml
Log:
JBREM-813: Changed tests.functional and tests.functional.core so that all http related tests run with both tomcat and jbossweb. Added tests.functional.http and tests.functional.http.core.
Revision Changes Path
No revision
No revision
1.88.2.17 +153 -6 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.16
retrieving revision 1.88.2.17
diff -u -b -r1.88.2.16 -r1.88.2.17
--- build.xml 13 Sep 2007 19:01:12 -0000 1.88.2.16
+++ build.xml 24 Oct 2007 01:00:08 -0000 1.88.2.17
@@ -9,7 +9,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.88.2.16 2007/09/13 19:01:12 rsigal Exp $ -->
+<!-- $Id: build.xml,v 1.88.2.17 2007/10/24 01:00:08 rsigal Exp $ -->
<project default="most" name="JBossRemoting">
@@ -79,6 +79,7 @@
<path id="third_party.classpath">
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
+ <exclude name="apache-tomcat/*.jar"/>
</fileset>
</path>
@@ -98,6 +99,29 @@
<pathelement path="${jdbc-driver-jar}"/>
</path>
+ <path id="third_party.classpath.tomcat">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ <exclude name="jbossweb/*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- The combined library classpath -->
+ <path id="library.classpath.tomcat">
+ <pathelement location="${compile.dir}"/>
+ <pathelement location="${etc.dir}"/>
+ <path refid="third_party.classpath.tomcat"/>
+ </path>
+
+ <path id="tests.classpath.tomcat">
+ <pathelement path="${ant.library.dir}/ant.jar"/>
+ <pathelement path="${ant.library.dir}/ant-junit.jar"/>
+ <pathelement location="${tests.compile.dir}"/>
+ <path refid="library.classpath.tomcat"/>
+ <pathelement path="${output.lib.dir}/jboss-remoting.jar"/>
+ <pathelement path="${jdbc-driver-jar}"/>
+ </path>
+
<path id="tests.marshall.classpath">
<path refid="library.classpath"/>
<pathelement path="${output.lib.dir}/jboss-remoting.jar"/>
@@ -553,13 +577,17 @@
<target name="tests.functional.core" depends="configure">
<antcall target="tests.functional.serialization.java.core" inheritrefs="true"/>
+ <antcall target="tests.functional.serialization.java.http.core" inheritrefs="true"/>
<antcall target="tests.functional.serialization.jboss.core" inheritrefs="true"/>
+ <antcall target="tests.functional.serialization.jboss.http.core" inheritrefs="true"/>
</target>
<!-- calls functional main tests and marshall test with both java and jboss (if jdk1.5) serialization -->
<target name="tests.functional" depends="configure">
<antcall target="tests.functional.serialization.java" inheritrefs="true"/>
+ <antcall target="tests.functional.serialization.java.http" inheritrefs="true"/>
<antcall target="tests.functional.serialization.jboss" inheritrefs="true"/>
+ <antcall target="tests.functional.serialization.jboss.http" inheritrefs="true"/>
</target>
<!-- runs functional tests with java serialization -->
@@ -621,19 +649,80 @@
<antcall target="tests.functional.serialization.jboss.http" inheritrefs="true"/>
</target>
+ <target name="tests.functional.http.core" depends="configure">
+ <antcall target="tests.functional.serialization.java.http.core" inheritrefs="true"/>
+ <antcall target="tests.functional.serialization.jboss.http.core" inheritrefs="true"/>
+ </target>
+
<target name="tests.functional.serialization.java.http">
<antcall target="tests.functional.main.http" inheritrefs="true">
<param name="remoting.metadata.key" value="remoting.metadata"/>
<param name="metadata" value="serializationtype=java"/>
- <param name="jboss-junit-configuration" value="java_serialization"/>
+ <param name="jboss-junit-configuration" value="java_serialization-jbossweb"/>
+ <param name="classpath" value="tests.classpath"/>
+ <param name="version" value="jbossweb"/>
</antcall>
+ <!--
+ <antcall target="tests.functional.main.http" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=java"/>
+ <param name="jboss-junit-configuration" value="java_serialization-tomcat"/>
+ <param name="classpath" value="tests.classpath.tomcat"/>
+ <param name="version" value="tomcat"/>
+ </antcall>
+ -->
</target>
<target name="tests.functional.serialization.jboss.http" if="isJDK5">
<antcall target="tests.functional.main.http" inheritrefs="true">
<param name="remoting.metadata.key" value="remoting.metadata"/>
<param name="metadata" value="serializationtype=jboss"/>
- <param name="jboss-junit-configuration" value="jboss_serialization"/>
+ <param name="jboss-junit-configuration" value="jboss_serialization-jbossweb"/>
+ <param name="classpath" value="tests.classpath"/>
+ <param name="version" value="jbossweb"/>
+ </antcall>
+ <!--
+ <antcall target="tests.functional.main.http" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=jboss"/>
+ <param name="jboss-junit-configuration" value="jboss_serialization-tomcat"/>
+ <param name="classpath" value="tests.classpath.tomcat"/>
+ <param name="version" value="tomcat"/>
+ </antcall>
+ -->
+ </target>
+
+ <target name="tests.functional.serialization.java.http.core">
+ <antcall target="tests.functional.main.http.core" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=java"/>
+ <param name="jboss-junit-configuration" value="java_serialization-jbossweb"/>
+ <param name="classpath" value="tests.classpath"/>
+ <param name="version" value="jbossweb"/>
+ </antcall>
+ <antcall target="tests.functional.main.http.core" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=java"/>
+ <param name="jboss-junit-configuration" value="java_serialization-tomcat"/>
+ <param name="classpath" value="tests.classpath.tomcat"/>
+ <param name="version" value="tomcat"/>
+ </antcall>
+ </target>
+
+ <target name="tests.functional.serialization.jboss.http.core" if="isJDK5">
+ <antcall target="tests.functional.main.http.core" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=jboss"/>
+ <param name="jboss-junit-configuration" value="jboss_serialization-jbossweb"/>
+ <param name="classpath" value="tests.classpath"/>
+ <param name="version" value="jbossweb"/>
+ </antcall>
+ <antcall target="tests.functional.main.http.core" inheritrefs="true">
+ <param name="remoting.metadata.key" value="remoting.metadata"/>
+ <param name="metadata" value="serializationtype=jboss"/>
+ <param name="jboss-junit-configuration" value="jboss_serialization-tomcat"/>
+ <param name="classpath" value="tests.classpath.tomcat"/>
+ <param name="version" value="tomcat"/>
</antcall>
</target>
@@ -653,6 +742,10 @@
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
<include name="**/remoting/**/*TestCase.class"/>
+ <exclude name="**/remoting/**/http/**/*TestCase.class"/>
+ <exclude name="**/remoting/**/*HTTP*TestCase.class"/>
+ <exclude name="**/remoting/**/*Http*TestCase.class"/>
+ <exclude name="**/remoting/**/*http*TestCase.class"/>
<exclude name="**/remoting/marshall/dynamic/remote/**/*TestCase.class"/>
<exclude name="**/remoting/serialization/**/jboss/*TestCase.class"/>
<exclude name="**/remoting/**/performance/**"/>
@@ -683,6 +776,10 @@
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
<include name="**/remoting/**/*TestCase.class"/>
+ <exclude name="**/remoting/**/http/**/*TestCase.class"/>
+ <exclude name="**/remoting/**/*HTTP*TestCase.class"/>
+ <exclude name="**/remoting/**/*Http*TestCase.class"/>
+ <exclude name="**/remoting/**/*http*TestCase.class"/>
<exclude name="**/remoting/**/ServerBindingTestCase.class"/>
<exclude name="**/remoting/marshall/dynamic/remote/**/*TestCase.class"/>
<exclude name="**/remoting/serialization/**/jboss/*TestCase.class"/>
@@ -749,11 +846,12 @@
<target name="tests.functional.main.http" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
+ <echo>http with ${version}</echo>
<junit printsummary="true" fork="yes" includeantruntime="true">
<jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
<classpath>
- <path refid="tests.classpath"/>
+ <path refid="${classpath}"/>
<pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
</classpath>
<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
@@ -762,7 +860,56 @@
<batchtest fork="yes" todir="${output.tests.results}"
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
- <include name="**/remoting/transport/http/**/*TestCase.class"/>
+ <!--include name="**/remoting/transport/http/**/*TestCase.class"/-->
+ <include name="**/remoting/**/http/**/*TestCase.class"/>
+ <include name="**/remoting/**/*HTTP*TestCase.class"/>
+ <include name="**/remoting/**/*Http*TestCase.class"/>
+ <include name="**/remoting/**/*http*TestCase.class"/>
+ <exclude name="**/remoting/marshall/dynamic/remote/**/*TestCase.class"/>
+ <exclude name="**/remoting/serialization/**/jboss/*TestCase.class"/>
+ <exclude name="**/remoting/**/performance/**"/>
+ <exclude name="**/remoting/**/nonserializable/**"/>
+ <exclude name="**/remoting/**/http/chunked/**"/>
+ <exclude name="**/remoting/versioning/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="tests.functional.main.http.core" depends="tests.jars">
+ <mkdir dir="${output.tests.results}"/>
+ <echo>http with ${version}</echo>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="${classpath}"/>
+ <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <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/**/http/**/*TestCase.class"/>
+ <include name="**/remoting/**/*HTTP*TestCase.class"/>
+ <include name="**/remoting/**/*Http*TestCase.class"/>
+ <include name="**/remoting/**/*http*TestCase.class"/>
+ <exclude name="**/remoting/**/HTTPSAsynchCallbackTestCase.class"/>
+ <exclude name="**/remoting/**/ServerBindingTestCase.class"/>
+ <exclude name="**/remoting/marshall/dynamic/remote/**/*TestCase.class"/>
+ <exclude name="**/remoting/serialization/**/jboss/*TestCase.class"/>
+ <exclude name="**/remoting/**/performance/**"/>
+ <exclude name="**/remoting/**/nonserializable/**"/>
+ <exclude name="**/remoting/**/http/chunked/**"/>
+ <!-- these are test cases that are only failing on certain env so will have to run manually -->
+ <exclude name="**/remoting/callback/pull/memory/**/*StoreCallbackTestCase*"/>
+ <exclude name="**/remoting/detection/multicast/*MulticastUnitTestCase*"/>
+ <exclude name="**/remoting/transport/http/compression/*CompressedHTTPInvokerTestCase*"/>
+ <!-- having to remove peformance tests as running out of memory failures -->
+ <exclude name="**/remoting/versioning/**/*TestCase.class"/>
+ <exclude name="**remoting/marshall/encrypt/**"/>
</fileset>
</batchtest>
</junit>
More information about the jboss-cvs-commits
mailing list