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

[dw...@apache.org]

Author: dwoods
Date: Thu Jan 14 19:47:44 2010
New Revision: 899377

URL: http://svn.apache.org/viewvc?rev=899377&view=rev
Log:
use exclude list to skip pluggability tests during second pass

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=899377&r1=899376&r2=899377&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/tck2.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/tck2.xml Thu Jan 14 19:47:44 2010
@@ -66,6 +66,8 @@
         <unzip overwrite="true" src="${tck_patches.zip}" dest="${tck.base}" />
         <copy overwrite="true"
             file="${tck.dir}/bin/ts.jte" tofile="${tck.dir}/bin/ts.jte.orig" />
+        <copy overwrite="true"
+            file="${tck.dir}/bin/ts.jtx" tofile="${tck.dir}/bin/ts.jtx.orig" />
         <!-- Pluggability tests using Toplink needs this dir created -->
         <mkdir dir="${tck.dir}/domains/domain1/logs" />
     </target>
@@ -282,10 +284,19 @@
             <param name="cp.property" value="${OPENJPA_CLASSPATH}" />
         </antcall>
 
-        <!-- HACK - Need to exclude Pluggability tests from a normal run,
+        <!-- Need to exclude Pluggability tests from a normal run,
             due to the need for Toplink.
         -->
-        <delete dir="${tck.dir}/src/com/sun/ts/tests/pluggability" />
+        <echo append="false" file="${tck.dir}/bin/ts.jtx">
+
+## exclude pluggability tests for normal OpenJPA runs
+com/sun/ts/tests/pluggability/contracts/Client.java#createContainerEntityManagerFactory_from_standalone
+com/sun/ts/tests/pluggability/contracts/Client.java#getManagedClassNames_from_standalone
+com/sun/ts/tests/pluggability/contracts/Client.java#getPersistenceProviderClassName_from_standalone
+com/sun/ts/tests/pluggability/contracts/Client.java#getPersistenceUnitName_from_standalone
+com/sun/ts/tests/pluggability/contracts/Client.java#getTransactionType_from_standalone
+
+        </echo>
 
         <!-- backup our updated ts.jte for later debugging -->
         <copy overwrite="true"
@@ -330,6 +341,10 @@
         <copy overwrite="true"
             file="${tck.dir}/bin/ts.jte" tofile="${tck.base}/ts.jte.pluggability" />
 
+        <!-- Restore any exclude file that was provided in the zip file -->
+        <copy overwrite="true"
+            file="${tck.dir}/bin/ts.jtx.orig" tofile="${tck.dir}/bin/ts.jtx" />
+
         <!-- first initialize the database -->
         <echo>Calling TCK initdb.xml</echo>
         <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />