Author: sebb
Date: Mon Feb 27 00:52:07 2017
New Revision: 1784491
URL: http://svn.apache.org/viewvc?rev=1784491&view=rev
Log:
No need to reset the log level at the start so can load standard property file and then override as necessary
This ensures that the system.properties property is defined early enough to be used
Modified:
jmeter/trunk/build.xml
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1784491&r1=1784490&r2=1784491&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Mon Feb 27 00:52:07 2017
@@ -2441,11 +2441,9 @@ run JMeter unless all the JMeter jars ar
<jvmarg value="${jacoco_params}batchtest:daemon:java(server)"/>
<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="-pjmeter.properties"/>
+ <!-- reset other parameters -->
<arg value="-qtestfiles/jmeter-batch.properties"/>
<arg value="-i"/>
<arg value="testfiles/log4j2-batch.xml"/>
@@ -2557,11 +2555,9 @@ run JMeter unless all the JMeter jars ar
<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="-pjmeter.properties"/>
+ <!-- reset other parameters -->
<arg value="-qtestfiles/jmeter-batch.properties"/>
<arg value="-n"/>
<arg value="-ttestfiles/${batchtest.jmx}"/>