[jboss-remoting-commits] JBoss Remoting SVN: r3715 - remoting2/branches/2.x.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2008-03-21 00:41:03 -0400 (Fri, 21 Mar 2008)
New Revision: 3715

Modified:
   remoting2/branches/2.x/build.xml
Log:
JBREM-923: Replaced multiplex with bisocket.

Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml	2008-03-21 03:01:24 UTC (rev 3714)
+++ remoting2/branches/2.x/build.xml	2008-03-21 04:41:03 UTC (rev 3715)
@@ -1005,8 +1005,6 @@
                     haltonfailure="no">
             <fileset dir="${tests.compile.dir}">
                <include name="**/remoting/**/*TestCase.class"/>
-               <!-- DML - these are reeeeeaaaalllyyyy slooooooooooowwww on linux -->
-               <!--<exclude name="**/remoting/**/marshall/compress/**/*TestCase.class"/>-->
                <exclude name="**/remoting/**/http/**/*TestCase.class"/>
                <exclude name="**/remoting/**/*HTTP*TestCase.class"/>
                <exclude name="**/remoting/**/*Http*TestCase.class"/>
@@ -2218,8 +2216,8 @@
          <param name="metadata" value="serializationtype=java"/>
          <param name="serialization" value="java"/>
       </antcall>
-      <antcall target="tests.performance.multiplex" inheritrefs="true">
-         <param name="remoting.metadata.key" value="remoting.metadata.callback"/>
+      <antcall target="tests.performance.bisocket" inheritrefs="true">
+         <param name="remoting.metadata.key" value="remoting.metadata"/>
          <param name="metadata" value="serializationtype=java"/>
          <param name="serialization" value="java"/>
       </antcall>
@@ -2262,8 +2260,8 @@
          <param name="metadata" value="serializationtype=jboss"/>
          <param name="serialization" value="jboss"/>
       </antcall>
-      <antcall target="tests.performance.multiplex" inheritrefs="true">
-         <param name="remoting.metadata.key" value="remoting.metadata.callback"/>
+      <antcall target="tests.performance.bisocket" inheritrefs="true">
+         <param name="remoting.metadata.key" value="remoting.metadata"/>
          <param name="metadata" value="serializationtype=jboss"/>
          <param name="serialization" value="jboss"/>
       </antcall>
@@ -2548,6 +2546,23 @@
          <param name="jboss-junit-configuration" value="socket_100000_3_2048_${serialization}"/>
       </antcall>
    </target>
+	
+   <target name="tests.performance.bisocket">
+      <antcall target="tests.performance.run" inheritrefs="true">
+         <param name="transport" value="bisocket"/>
+         <param name="numofcalls" value="100000"/>
+         <param name="numofclients" value="1"/>
+         <param name="payloadsize" value="1024"/>
+         <param name="jboss-junit-configuration" value="bisocket_100000_1_1024_${serialization}"/>
+      </antcall>
+      <antcall target="tests.performance.run" inheritrefs="true">
+         <param name="transport" value="bisocket"/>
+         <param name="numofcalls" value="100000"/>
+         <param name="numofclients" value="3"/>
+         <param name="payloadsize" value="2048"/>
+         <param name="jboss-junit-configuration" value="bisocket_100000_3_2048_${serialization}"/>
+      </antcall>
+   </target>
 
    <target name="tests.performance.http">
       <antcall target="tests.performance.run" inheritrefs="true">
@@ -2701,6 +2716,12 @@
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
          </classpath>
+         <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="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
          <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
                     extension="-${jboss-junit-configuration}.xml"/>