openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r896033 - /openjpa/trunk/openjpa-integration/tck/pom.xml
Date Tue, 05 Jan 2010 13:26:00 GMT
Author: dwoods
Date: Tue Jan  5 13:26:00 2010
New Revision: 896033

URL: http://svn.apache.org/viewvc?rev=896033&view=rev
Log:
OPENJPA-1453 Old 1.0b TCK does not create a reports dir

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

Modified: openjpa/trunk/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/pom.xml?rev=896033&r1=896032&r2=896033&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/pom.xml Tue Jan  5 13:26:00 2010
@@ -504,7 +504,7 @@
                             <attribute name="buildfile" />
                             <attribute name="target" />
                             <sequential>
-                                <java classname="org.apache.tools.ant.launch.Launcher"
fork="true" failonerror="true" dir="${tck.dir}/src" append="true" output="${tck.log}" timeout="7200000">
+                                <java classname="org.apache.tools.ant.launch.Launcher"
fork="true" failonerror="true" dir="${tck.dir}/src" append="true" output="${tck.log}" timeout="7200000"
resultproperty="tsant.result">
                                     <arg value="-emacs" />
                                     <arg value="-buildfile" />
                                     <arg value="@{buildfile}" />
@@ -540,10 +540,12 @@
                         <!-- first initialize the database -->
                         <echo>Calling TCK initdb.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database"
/>
+                        <echo>TCK initdb.xml returned result=${tsant.result}</echo>
 
                         <!-- now run the TCK -->
                         <echo>Calling TCK build.xml</echo>
                         <tsant buildfile="${tck.dir}/bin/build.xml" target="runclient"
/>
+                        <echo>TCK build.xml returned result=${tsant.result}</echo>
 
                         <!-- archive the results -->
                         <property name="tck.results.archive" value="${tck.base}/openjpa-tck-results.zip"
/>
@@ -553,33 +555,6 @@
                         </zip>
                         <echo>Results archive at: ${tck.results.archive}</echo>
 
-                        <!-- Figure out the Passed/Failed counts -->
-                        <resourcecount property="count.passed">
-                          <tokens>
-                            <concat>
-                              <filterchain>
-                                <tokenfilter>
-                                  <containsstring contains="Passed."/>
-                                </tokenfilter>
-                              </filterchain>
-                              <fileset dir="${jpatck.reports.dir}" includes="summary.txt"
/>
-                            </concat>
-                          </tokens>
-                        </resourcecount>
-                        <resourcecount property="count.failed">
-                          <tokens>
-                            <concat>
-                              <filterchain>
-                                <tokenfilter>
-                                  <containsstring contains="Failed."/>
-                                </tokenfilter>
-                              </filterchain>
-                              <fileset dir="${jpatck.reports.dir}" includes="summary.txt"
/>
-                            </concat>
-                          </tokens>
-                        </resourcecount>
-                        <echo>TCK Results - Passed: ${count.passed}, Failed: ${count.failed}</echo>
-
                         <!--
                             The TCK's Java process doesn't actually fail when
                             tests fail, so we need to parse the results file
@@ -589,9 +564,9 @@
                         <condition property="jpatck.failed">
                             <contains string="${jpatck.results}" substring="Completed
test run: not ok" />
                         </condition>
-                        <fail if="jpatck.failed">${count.failed} tests failed</fail>
+                        <fail if="jpatck.failed">Some tests failed</fail>
                         <!-- else -->
-                        <echo>Pased JPA 1.0b TCK!</echo>
+                        <echo>JPA TCK Passed 100%!</echo>
 
                     </tasks>
                   </configuration>



Mime
View raw message