svn commit: r899034 - /openjpa/trunk/openjpa-integration/tck/tck2.xml

[dw...@apache.org]

Author: dwoods
Date: Thu Jan 14 02:38:55 2010
New Revision: 899034

URL: http://svn.apache.org/viewvc?rev=899034&view=rev
Log:
add some extra results info

Modified:
    openjpa/trunk/openjpa-integration/tck/tck2.xml

Modified: openjpa/trunk/openjpa-integration/tck/tck2.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/tck2.xml?rev=899034&r1=899033&r2=899034&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/tck2.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/tck2.xml Thu Jan 14 02:38:55 2010
@@ -232,7 +232,7 @@
     <!--
         Macro to determine how many tests passed/failed
     -->
-    <macrodef name="results">
+    <macrodef name="results.count">
         <!-- Figure out the Passed/Failed counts -->
         <sequential>
         <resourcecount property="count.passed">
@@ -374,13 +374,14 @@
             tests fail, so we need to parse the results file
             for a string indicating whether or not it passed.
         -->
+        <results.count />
         <loadfile property="jpatck.results" srcfile="${tck.work}/jtData/log.txt" />
         <condition property="jpatck.failed">
             <contains string="${jpatck.results}" substring="Completed test run: not ok" />
         </condition>
-        <fail if="jpatck.failed">Test Results:  FAILED ${count.failed} tests!</fail>
+        <fail if="jpatck.failed">Test Results (${results.name}):  FAILED ${count.failed} tests!</fail>
         <!-- else -->
-        <echo>Test Results:  PASSED!</echo>
+        <echo>Test Results (${results.name}):  PASSED!</echo>
     </target>
 
 </project>