jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1749161 - in /jmeter/trunk: build.xml xdocs/changes.xml
Date Sun, 19 Jun 2016 12:51:25 GMT
Author: sebb
Date: Sun Jun 19 12:51:25 2016
New Revision: 1749161

URL: http://svn.apache.org/viewvc?rev=1749161&view=rev
Log:
Batch test file comparisons fail on Windows as XML files are generated as EOL=LF
fix build.xml
Bugzilla Id: 59720

Modified:
    jmeter/trunk/build.xml
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1749161&r1=1749160&r2=1749161&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Jun 19 12:51:25 2016
@@ -1349,9 +1349,7 @@ run JMeter unless all the JMeter jars ar
     <exclude name="${dest.jar.jmeter}/testfiles/*.jmx"/>
     <exclude name="${dest.jar.jmeter}/testfiles/*.jtl"/>
     <!-- These are generated with EOL=LF -->
-    <exclude name="${dest.jar.jmeter}/testfiles/BatchTestLocal.xml"/>
-    <exclude name="${dest.jar.jmeter}/testfiles/Bug*.xml"/>
-    <exclude name="${dest.jar.jmeter}/testfiles/HTMLParserTestFile_2.xml"/>
+    <exclude name="${dest.jar.jmeter}/testfiles/*.xml"/>
     <!-- Ignore unit test output -->
     <exclude name="${dest.jar.jmeter}/testfiles/*.out"/>
     <exclude name="${dest.jar.jmeter}/testfiles/Sample_*.png"/>
@@ -1385,9 +1383,7 @@ run JMeter unless all the JMeter jars ar
     <include name="${dest.jar.jmeter}/testfiles/*.jmx"/>
     <include name="${dest.jar.jmeter}/testfiles/*.jtl"/>
     <!-- These are generated with EOL=LF -->
-    <include name="${dest.jar.jmeter}/testfiles/BatchTestLocal.xml"/>
-    <include name="${dest.jar.jmeter}/testfiles/Bug*.xml"/>
-    <include name="${dest.jar.jmeter}/testfiles/HTMLParserTestFile_2.xml"/>
+    <include name="${dest.jar.jmeter}/testfiles/*.xml"/>
     <!-- Include the image files used in parsing / embedded download tests -->
     <include name="${dest.jar.jmeter}/testfiles/**/*.gif"/>
     <include name="${dest.jar.jmeter}/testfiles/**/*.jpg"/>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1749161&r1=1749160&r2=1749161&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Jun 19 12:51:25 2016
@@ -156,6 +156,7 @@ Summary
     <li><bug>59607</bug>JMeter crashes when reading large test plan (greater
than 2g). Based on fix by Felix Draxler (felix.draxler at sap.com)</li>
     <li><bug>59621</bug>Error count in report dashboard is one off.</li>
     <li><bug>59657</bug>Only set font in JSyntaxTextArea, when property
<code>jsyntaxtextarea.font.family</code> is set.</li>
+    <li><bug>59720</bug>Batch test file comparisons fail on Windows as
XML files are generated as EOL=LF</li>
 </ul>
 
  <!--  =================== Thanks =================== -->



Mime
View raw message