Author: vladimirsitnikov Date: Sun Apr 3 16:08:29 2016 New Revision: 1737593
URL: http://svn.apache.org/viewvc?rev=1737593&view=rev Log: Log file contents in ant.batchtest failure case Docker image at Travis does not support SNI, so reverted to sudo=true images. closes #180 Modified: jmeter/trunk/.travis.yml jmeter/trunk/build.xml Modified: jmeter/trunk/.travis.yml URL: http://svn.apache.org/viewvc/jmeter/trunk/.travis.yml?rev=1737593&r1=1737592&r2=1737593&view=diff ============================================================================== --- jmeter/trunk/.travis.yml (original) +++ jmeter/trunk/.travis.yml Sun Apr 3 16:08:29 2016 @@ -15,5 +15,7 @@ matrix: script: ant -Djava.awt.headless=true checkstyle - jdk: oraclejdk7 script: ant -Djava.awt.headless=true test + sudo: true # otherwise TEST_HTTPS.jmx -> sni.velox.ch does not work - jdk: oraclejdk8 script: ant -Djava.awt.headless=true test + sudo: true # otherwise TEST_HTTPS.jmx -> sni.velox.ch does not work Modified: jmeter/trunk/build.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1737593&r1=1737592&r2=1737593&view=diff ============================================================================== --- jmeter/trunk/build.xml (original) +++ jmeter/trunk/build.xml Sun Apr 3 16:08:29 2016 @@ -2515,23 +2515,36 @@ run JMeter unless all the JMeter jars ar <checkfile type="output" file="${batchtest.out}${file.separator}${batchtest.name}.jtl"/> <local name="BatchTestLocal.csv.OK"/> + <local name="file1.csv"/> + <local name="file2.csv"/> + + <loadfile property="file1.csv" srcFile="${batchtest.inp}/${batchtest.name}.csv"/> + <loadfile property="file2.csv" srcFile="${batchtest.out}/${batchtest.name}.csv"/> <condition property="BatchTestLocal.csv.OK"> <filesmatch file1="${batchtest.inp}/${batchtest.name}.csv" file2="${batchtest.out}/${batchtest.name}.csv"/> </condition> <fail unless="BatchTestLocal.csv.OK"> CSV Files are not identical. ${batchtest.inp}${file.separator}${batchtest.name}.csv + ${file1.csv} ${batchtest.out}${file.separator}${batchtest.name}.csv + ${file2.csv} </fail> <local name="BatchTestLocal.xml.OK"/> + <local name="file1.xml"/> + <local name="file2.xml"/> + <loadfile property="file1.xml" srcFile="${batchtest.inp}/${batchtest.name}.xml"/> + <loadfile property="file2.xml" srcFile="${batchtest.out}/${batchtest.name}.xml"/> <condition property="BatchTestLocal.xml.OK"> <filesmatch file1="${batchtest.inp}/${batchtest.name}.xml" file2="${batchtest.out}/${batchtest.name}.xml"/> </condition> <fail unless="BatchTestLocal.xml.OK"> XML Files are not identical. ${batchtest.inp}${file.separator}${batchtest.name}.xml + ${file1.xml} ${batchtest.out}${file.separator}${batchtest.name}.xml + ${file2.xml} </fail> <echo level="info">${batchtest.name} output files compared OK</echo>
