jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1749218 - /jmeter/trunk/build.xml
Date Sun, 19 Jun 2016 22:23:04 GMT
Author: sebb
Date: Sun Jun 19 22:23:03 2016
New Revision: 1749218

URL: http://svn.apache.org/viewvc?rev=1749218&view=rev
Log:
Use jmeter.properties for testing whenever possible
Fix batch tests
Bugzilla Id: 59723

Modified:
    jmeter/trunk/build.xml

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1749218&r1=1749217&r2=1749218&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Jun 19 22:23:03 2016
@@ -2418,7 +2418,13 @@ run JMeter unless all the JMeter jars ar
                 <path refid="classpath"/>
                </classpath>
                <sysproperty key="java.awt.headless" value="true"/>
+                <!-- Bug 59723 -->
+                <!-- quieten the logging; this has to be done first -->
                 <arg value="-ptestfiles/jmeter-batch.properties"/>
+                <!-- pick up default properties -->
+                <arg value="-qjmeter.properties"/>
+                <!-- reset the logging and other parameters -->
+                <arg value="-qtestfiles/jmeter-batch.properties"/>
                 <arg value="-j"/>
                 <arg value="${batchtestserver.out}/${batchtestserver.log}"/>
                 <arg value="-Dserver_port=${rmi_port}"/>
@@ -2514,7 +2520,13 @@ run JMeter unless all the JMeter jars ar
        <sysproperty key="user.language" value="en"/>
        <sysproperty key="user.region" value="US"/>
        <sysproperty key="java.awt.headless" value="false"/>
+        <!-- Bug 59723 -->
+        <!-- quieten the logging; this has to be done first -->
         <arg value="-ptestfiles/jmeter-batch.properties"/>
+        <!-- pick up default properties -->
+        <arg value="-qjmeter.properties"/>
+        <!-- reset the logging and other parameters -->
+        <arg value="-qtestfiles/jmeter-batch.properties"/>
         <arg value="-n"/>
         <arg value="-ttestfiles/${batchtest.name}.jmx"/>
         <arg value="-j"/>



Mime
View raw message