db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r524179 - /db/derby/code/trunk/build.xml
Date Fri, 30 Mar 2007 17:04:00 GMT
Author: djd
Date: Fri Mar 30 10:03:59 2007
New Revision: 524179

URL: http://svn.apache.org/viewvc?view=rev&rev=524179
Log:
Add a junit top level target (junit-all-codeline-jars) that runs the junit-all test from a
codeline setting the classpath to include the derby jar files.

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=524179&r1=524178&r2=524179
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Mar 30 10:03:59 2007
@@ -1677,7 +1677,12 @@
   </target>
 
   <target name="junit-oneclass" depends="junit-init">
-    <junit printsummary="on"
+    <condition property="derby.junit.classpath" value="">
+      <not>
+        <isset property="derby.junit.classpath"/>
+      </not>
+    </condition>
+  	 <junit printsummary="on"
            fork="yes" forkmode="once"
            jvm="${derby.junit.jvm}"
            showoutput="yes"
@@ -1685,6 +1690,9 @@
       <formatter type="xml"/>
       <test name="${derby.junit.testname}" 
             todir="junit_${derby.junit.timestamp}"/>
+      <classpath>
+     	    <pathelement path="${derby.junit.classpath}"/>
+      </classpath>
     </junit>
   </target>
  
@@ -1779,6 +1787,19 @@
 
   <target name="l10ncheck"> 
     <ant dir="${derbysrc.dir}/../tools/l10n"/>
-  </target>   
+  </target>  
+	
+	<!-- Run the junit-all target with the classpath set to include
+	     the main derby jar files. Requires that the caller have
+	     junit.jar in CLASSPATH due to some bug in ant that is
+	     fixed in version 1.7.
+	-->
+	<target name="junit-all-codeline-jars" depends="setsanityname">
+		<property name="derby.jar.base" value="${basedir}/jars/${sanity.name}"/>
+	    <antcall target="junit-all">
+	      <param name="derby.junit.classpath"
+	        value="${derby.jar.base}/derbyTesting.jar:${derby.jar.base}/derbynet.jar:${derby.jar.base}/derbytools.jar:${derby.jar.base}/derbyclient.jar"/>
+	    </antcall>
+	</target>
 
 </project>



Mime
View raw message