db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r470636 - /db/derby/code/trunk/build.xml
Date Fri, 03 Nov 2006 02:13:30 GMT
Author: fuzzylogic
Date: Thu Nov  2 18:13:30 2006
New Revision: 470636

URL: http://svn.apache.org/viewvc?view=rev&rev=470636
Log:
DERBY-2006: Refactor junit-oneclass target to set the jvm from a property,
and set the default to 'java' in junit-init.

Modified:
    db/derby/code/trunk/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?view=diff&rev=470636&r1=470635&r2=470636
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Nov  2 18:13:30 2006
@@ -1602,6 +1602,7 @@
 
   <target name="junit-init">
     <tstamp prefix="derby.junit"/>
+    <property name="derby.junit.jvm" value="java"/>
     <mkdir dir="junit_${derby.junit.DSTAMP}_${derby.junit.TSTAMP}/testout"/>
   </target>
 
@@ -1614,26 +1615,26 @@
   <target name="junit-oneclass" depends="junit-init">
     <junit printsummary="on"
            fork="yes" forkmode="once"
+           jvm="${derby.junit.jvm}"
            showoutput="yes"
            dir="junit_${derby.junit.DSTAMP}_${derby.junit.TSTAMP}/testout">
       <formatter type="xml"/>
       <test name="${derby.junit.testname}" todir="junit_${derby.junit.DSTAMP}_${derby.junit.TSTAMP}"/>
-      <classpath path="${out.dir};${junit}"/>
+      <classpath>
+        <pathelement path="${out.dir}"/>
+        <pathelement path="${junit}"/>
+      </classpath>
     </junit>
   </target>
  
   <!-- only execute jdbc4 suite if we have a pointer to a 1.6 VM -->
   <target name="junit-jdbc4" if="jdk16">
-    <junit printsummary="on"
-           fork="yes" forkmode="once"
-           jvm="${jdk16}/bin/java"
-           showoutput="yes"
-           dir="junit_${derby.junit.DSTAMP}_${derby.junit.TSTAMP}/testout">
-      <formatter type="xml"/>
-      <test name="org.apache.derbyTesting.functionTests.tests.jdbc4._Suite"
-            todir="junit_${derby.junit.DSTAMP}_${derby.junit.TSTAMP}"/>
-      <classpath path="${out.dir};${junit}"/>
-    </junit> 
+    <antcall target="junit-oneclass">
+      <param name="derby.junit.jvm"
+             value="${jdk16}/bin/java"/>
+      <param name="derby.junit.testname"
+             value="org.apache.derbyTesting.functionTests.tests.jdbc4._Suite"/>
+    </antcall>
   </target>
 
   <target name="junit-all" depends="junit-init,junit-jdbc4">



Mime
View raw message