db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r594809 - in /db/derby/code/trunk: build.xml java/testing/org/apache/derby/build.xml tools/ant/properties/dirs.properties
Date Wed, 14 Nov 2007 09:31:50 GMT
Author: kristwaa
Date: Wed Nov 14 01:31:49 2007
New Revision: 594809

URL: http://svn.apache.org/viewvc?rev=594809&view=rev
Log:
DERBY-3149: Add ant targets for building and running the package private tests against the
classes directories. Made the compilation of the classes conditional, i.e. don't compile them
again if it is not necessary.
Patch-file: derby-3149-2a-conditional_compilation_fix.diff

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/testing/org/apache/derby/build.xml
    db/derby/code/trunk/tools/ant/properties/dirs.properties

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=594809&r1=594808&r2=594809&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Nov 14 01:31:49 2007
@@ -398,7 +398,7 @@
 	
   <!-- Build the package private tests -->
   <target name="pptesting" if="jdk16" depends="testing">
-    <ant dir="${derby.pptesting.src.dir}"/>
+    <ant dir="${derby.testing.src.dir}/org/apache/derby"/>
   </target>
 
 

Modified: db/derby/code/trunk/java/testing/org/apache/derby/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derby/build.xml?rev=594809&r1=594808&r2=594809&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derby/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derby/build.xml Wed Nov 14 01:31:49 2007
@@ -17,10 +17,14 @@
 -->
 <project default="pptesting-build" basedir="../../../../../">
 
+    <!-- User settings -->
+    <property file="${user.home}/ant.properties"/>
+
     <!-- Compile-time classpath properties files -->
     <property file="${properties.dir}/extrapath.properties"/>
     <property file="${properties.dir}/compilepath.properties"/>
 
+    <!-- Compile package private tests. -->
     <target name="compile">
         <mkdir dir="${out.pptesting.dir}"/>
 
@@ -30,13 +34,13 @@
             fork="yes"
             bootclasspath="${empty}"
             nowarn="on"
-            debug="${debug}"
+            debug="true"
             depend="${depend}"
             deprecation="${deprecation}"
             optimize="${optimize}"
             proceed="${proceed}"
             verbose="${verbose}"
-            srcdir="${derby.pptesting.src.dir}"
+            srcdir="${derby.testing.src.dir}"
             destdir="${out.pptesting.dir}">
             <classpath>
                 <!-- Fix this to use the Java SE 5 classpath -->
@@ -44,13 +48,15 @@
                 <pathelement path="${junit}"/>
                 <pathelement path="${out.dir}"/>
             </classpath>
-            <include name="**/*Test.java"/>
-            <include name="**/_Suite.java"/>
-            <include name="**/PackagePrivateTestSuite.java"/>
+            <!-- Can't rely on just compiling PackagePrivateTestSuite, as ant
+                 won't check the timestamp on the other Java files to determine
+                 if they have been changed since last compile then. -->
+            <include name="org/apache/derby/**/*java"/>
         </javac>
     </target>
 
+    <!-- Build package private tests. Currently this only involve compilation,
+         but might be extended with packaging and more later on. -->
     <target name="pptesting-build" depends="compile">
-       <echo message="Package private tests build completed."/>
     </target>
 </project>

Modified: db/derby/code/trunk/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/dirs.properties?rev=594809&r1=594808&r2=594809&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Wed Nov 14 01:31:49 2007
@@ -57,7 +57,6 @@
 derby.build.src.dir=${derbysrc.dir}/build
 derby.demo.src.dir=${derbysrc.dir}/demo
 derby.testing.src.dir=${derbysrc.dir}/testing
-derby.pptesting.src.dir=${derby.testing.src.dir}/org/apache/derby
 derby.storeless.src.dir=${derbysrc.dir}/storeless
 derby.metadata.src.dir=${derby.engine.src.dir}/org/apache/derby/impl/jdbc
 



Mime
View raw message