You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/26 20:07:05 UTC
svn commit: r1784482 - /jmeter/trunk/build.xml
Author: pmouawad
Date: Sun Feb 26 20:07:05 2017
New Revision: 1784482
URL: http://svn.apache.org/viewvc?rev=1784482&view=rev
Log:
Fix test failure by adding an option to allow ignoring non empty (with errors) log file
Modified:
jmeter/trunk/build.xml
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1784482&r1=1784481&r2=1784482&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Feb 26 20:07:05 2017
@@ -2492,6 +2492,7 @@ run JMeter unless all the JMeter jars ar
<!-- will be overwritten by antcall parameters -->
<property name="taskname" value="jmeter"/>
<property name="remote" value="-X"/>
+ <property name="batchtest.ignoreErrorLogs" value="false" />
<property name="batchtest.inp" location="${basedir}/bin/testfiles"/>
<property name="batchtest.out" location="${basedir}/bin"/>
<property name="batchtest.name" value="BatchTestLocal"/>
@@ -2624,9 +2625,16 @@ run JMeter unless all the JMeter jars ar
<echo level="info">${batchtest.name} output files compared OK</echo>
<local name="BatchTestLocal.len"/>
+ <!-- We define "BatchTestLocal.len" property only if log file is empty
+ or batchtest.ignoreErrorLogs is false
+ -->
<condition property="BatchTestLocal.len">
- <length file="${batchtest.out}/${batchtest.name}.log" when="equal" length="0" />
+ <or>
+ <length file="${batchtest.out}/${batchtest.name}.log" when="equal" length="0" />
+ <equals arg1="${batchtest.ignoreErrorLogs}" arg2="true" casesensitive="true"/>
+ </or>
</condition>
+
<fail unless="BatchTestLocal.len">
Error detected in log file. See above.
</fail>
@@ -2741,12 +2749,14 @@ run JMeter unless all the JMeter jars ar
<param name="batchtest.variable" value="jmeter.httpsampler"/>
<param name="batchtest.value" value="HttpClient4"/>
</antcall>
-
+
<antcall target="batchtest">
<param name="batchtest.name" value="TEST_HTTP_Java"/>
<param name="batchtest.jmx" value="TEST_HTTP.jmx"/>
<param name="batchtest.variable" value="jmeter.httpsampler"/>
<param name="batchtest.value" value="Java"/>
+ <!-- This test contains a Redirection loop that leads to an error -->
+ <param name="batchtest.ignoreErrorLogs" value="false" />
</antcall>
</target>