Author: ron.sigal(a)jboss.com Date: 2008-04-30 23:00:46 -0400 (Wed, 30 Apr 2008) New Revision: 4101 Modified: remoting2/branches/2.x/build.xml Log: JBREM-238: Added jrunit.logdir property. Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2008-05-01 02:34:43 UTC (rev 4100) +++ remoting2/branches/2.x/build.xml 2008-05-01 03:00:46 UTC (rev 4101) @@ -255,9 +255,11 @@ <!-- test properties --> <property name="tests.src.dir" value="${tests.dir}"/> <property name="tests.compile.dir" value="${output.dir}/tests/classes"/> + <property name="output.tests" value="${output.dir}/tests"/> <property name="output.tests.classes" value="${output.dir}/tests/classes"/> <property name="output.tests.results" value="${output.dir}/tests/results"/> <property name="output.tests.performance" value="${output.dir}/tests/performance"/> + <property name="output.tests.stress" value="${output.dir}/tests/stress"/> <property name="output.tests.tmp" value="${output.dir}/tests/tmp"/> <property name="manifest.file" value="${output.etc.dir}/default.mf"/> @@ -1051,6 +1053,7 @@ <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}" @@ -1105,6 +1108,7 @@ <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}" @@ -1167,6 +1171,7 @@ <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}" @@ -1277,6 +1282,7 @@ <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}" @@ -1324,6 +1330,7 @@ <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}" @@ -1363,6 +1370,7 @@ <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}" @@ -1416,6 +1424,7 @@ <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}" @@ -1448,6 +1457,7 @@ <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}"/> <!-- 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"/> @@ -1550,6 +1560,7 @@ <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}"/> <!-- 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"/> @@ -2048,6 +2059,7 @@ <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/--> <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> + <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}" @@ -2087,6 +2099,7 @@ <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/> <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/--> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> + <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}" @@ -2127,6 +2140,7 @@ <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/> <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/--> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> + <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}" @@ -2167,6 +2181,7 @@ <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="jrunit.logdir" value="${output.tests}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> <batchtest fork="yes" todir="${output.tests.results}" @@ -2292,6 +2307,7 @@ <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/> <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/--> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> + <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}" @@ -2964,6 +2980,7 @@ <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="jrunit.logdir" value="${output.tests.performance}"/> <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${jboss-junit-configuration}.xml"/> @@ -3377,7 +3394,7 @@ <param name="transport" value="http"/> </antcall> <antcall target="tests.stress.run" inheritrefs="true"> - <param name="transport" value="multiplex"/> + <param name="transport" value="bisocket"/> </antcall> </target> @@ -3397,7 +3414,7 @@ <echo>Running stress tests for protocol: ${transport}, number of clients: ${numofclients}, payload size: ${payloadsize}, number of calls: ${numofcalls}</echo> <!-- <mkdir dir="${output.tests.performance}/${transport}/${numofclients}/${numofcalls}/${payloadsize}"/>--> - <mkdir dir="${output.tests.performance}"/> + <mkdir dir="${output.tests.stress}"/> <mkdir dir="${output.tests.tmp}"/> <echo>jboss-junit-configuration = ${jboss-junit-configuration}</echo> <junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}"> @@ -3407,10 +3424,18 @@ <jvmarg value="-Dremoting.payload.size=${payloadsize}"/> <jvmarg value="-Dremoting.serialization=${serialization}"/> <!--<jvmarg value="-Djvm.mx=512"/>--> - <jvmarg value="-Djrunit.result_timeout=900000"/> - <jvmarg value="-Djrunit.tear_down_timeout=900000"/> - <jvmarg value="-Djrunit.run_test_timeout=900000"/> + <jvmarg value="-Djrunit.result_timeout=1200000"/> + <jvmarg value="-Djrunit.tear_down_timeout=1200000"/> + <jvmarg value="-Djrunit.run_test_timeout=1200000"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> + <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.stress}"/> + <classpath> <path refid="tests.classpath"/> <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/> @@ -3529,6 +3554,7 @@ <target name="clean" depends="configure"> <delete dir="${output.dir}" quiet="true"/> + <delete dir="test_logs"/> </target> <target name="most" depends="clean,jars"/> @@ -3555,15 +3581,6 @@ </fileset> </move> - <!-- calls the ant build for the multiplex doc --> - <ant dir="docs/Multiplex"/> - - <move todir="docs"> - <fileset dir="docs/Multiplex/build/en/pdf"> - <include name="*.pdf"/> - </fileset> - </move> - </target> <!-- ================================================================== -->