From fae9fbcc8818b51bf7fa69636c7935ac5785c7ad Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <vladimirsitnikov@apache.org>
Date: Sun, 3 Apr 2016 16:08:29 +0000
Subject: [PATCH] Log file contents in ant.batchtest failure case

Docker image at Travis does not support SNI, so reverted to sudo=true images.

closes #180

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1737593 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 820716a95ac00026dd02e876d8b534c15d544ccb
---
 .travis.yml |  2 ++
 build.xml   | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 03f9089beb..42d3e84672 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/build.xml b/build.xml
index 5bd7560699..1fe609d983 100644
--- a/build.xml
+++ b/build.xml
@@ -2515,23 +2515,36 @@ run JMeter unless all the JMeter jars are added.
     <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>