You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/08/10 15:49:02 UTC

svn commit: r564591 - /jakarta/jmeter/branches/rel-2-2/build.xml

Author: sebb
Date: Fri Aug 10 06:49:01 2007
New Revision: 564591

URL: http://svn.apache.org/viewvc?view=rev&rev=564591
Log:
Check the contents of the batchtest log file for any unexpected output

Modified:
    jakarta/jmeter/branches/rel-2-2/build.xml

Modified: jakarta/jmeter/branches/rel-2-2/build.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.xml?view=diff&rev=564591&r1=564590&r2=564591
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/build.xml Fri Aug 10 06:49:01 2007
@@ -1467,6 +1467,7 @@
        </classpath>
     	<!-- Detect if non-GUI runs OK headless by forcing it to try using non-headless mode -->
        <sysproperty key="java.awt.headless" value="false"/>
+        <arg value="-pjmeter-batch.properties"/>
        <arg value="-n"/>
        <arg value="-ttestfiles/${batchtest.name}.jmx"/>
         <arg value="-j"/>
@@ -1483,11 +1484,23 @@
   	 	</and>
      </condition>
   	<fail unless="BatchTestLocal.OK">
-  		BatchTest failed. Files are not identical.
+  		Files are not identical.
   	</fail>
   	
   	<echo level="info">${batchtest.name} output files compared OK</echo>
-  	
+ 
+    <!-- Show the log file -->
+    <concat>
+      <filelist dir="${batchtest.out}" files="${batchtest.name}.log" />
+    </concat>
+
+  	<condition property="BatchTestLocal.len">
+  		<length file="${batchtest.out}/${batchtest.name}.log" when="equal" length="0" />
+  	</condition>
+  	<fail unless="BatchTestLocal.len">
+  		Error detected in log file. See above.
+  	</fail>
+
   	<deleteworkfiles/>
   	
   </target>



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org