Author: sebb
Date: Wed Sep 21 22:30:15 2011
New Revision: 1173895

URL: http://svn.apache.org/viewvc?rev=1173895&view=rev
Log:
Use taskname to identify output when running tests

Modified:
    jakarta/jmeter/trunk/build.xml

Modified: jakarta/jmeter/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=1173895&r1=1173894&r2=1173895&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Wed Sep 21 22:30:15 2011
@@ -1790,7 +1790,7 @@ run JMeter unless all the JMeter jars ar
     <property name="rmi_port" value="2099"/>
     <parallel>
         <daemons>
-            <java classname="org.apache.jmeter.NewDriver" fork="yes" 
dir="${batchtestserver.out}">
+            <java taskname="server" classname="org.apache.jmeter.NewDriver" 
fork="yes" dir="${batchtestserver.out}">
                <classpath>
                 <fileset dir="${dest.jar.jmeter}" includes="*.jar"/>
                 <fileset dir="${dest.jar}" includes="*.jar"/>
@@ -1809,6 +1809,7 @@ run JMeter unless all the JMeter jars ar
             <sleep seconds="1"/>
             <antcall target="batchtest">
                 <param name="remote" value="-Rlocalhost:${rmi_port}"/>
+                <param name="taskname" value="client"/>
             </antcall>
         </sequential>
     </parallel>
@@ -1833,6 +1834,8 @@ run JMeter unless all the JMeter jars ar
 
   <target name="batchtest" description="Run the batch test and compare output 
files">
 
+    <!-- will be overwritten by antcall paramaters -->
+    <property name="taskname" value="jmeter"/>
     <property name="remote" value="-X"/>
     <property name="batchtest.inp" location="${basedir}/bin/testfiles"/>
     <property name="batchtest.out" location="${basedir}/bin"/>
@@ -1871,7 +1874,7 @@ run JMeter unless all the JMeter jars ar
 
     <deleteworkfiles/>
 
-    <java classname="org.apache.jmeter.NewDriver" fork="yes" 
dir="${basedir}/bin">
+    <java taskname="${taskname}" classname="org.apache.jmeter.NewDriver" 
fork="yes" dir="${basedir}/bin">
        <classpath>
         <fileset dir="${dest.jar.jmeter}" includes="*.jar"/>
         <fileset dir="${dest.jar}" includes="*.jar"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to