db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r396035 - in /db/derby/code/trunk: java/testing/ java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ java/testing/org/apache/derbyTesting/functionTests/tests/lang/ java/testing/org/apache/derbyTesting/functionTests/tests/larg...
Date Fri, 21 Apr 2006 23:51:56 GMT
Author: fuzzylogic
Date: Fri Apr 21 16:51:52 2006
New Revision: 396035

URL: http://svn.apache.org/viewcvs?rev=396035&view=rev
Log:
DERBY-1078: Cleanup compilation order and JDK 1.3 and JDK 1.4 build separation
in the tests.

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml   (with props)
Modified:
    db/derby/code/trunk/java/testing/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
    db/derby/code/trunk/tools/ant/properties/dirs.properties

Modified: db/derby/code/trunk/java/testing/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/build.xml?rev=396035&r1=396034&r2=396035&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/build.xml (original)
+++ db/derby/code/trunk/java/testing/build.xml Fri Apr 21 16:51:52 2006
@@ -43,6 +43,7 @@
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/harness"/> 
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData"/> 
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/util"/> 
+    <ant dir="${derby.testing.src.dir}/${derby.testing.unittest.dir}"/> 
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/junitTests/compatibility"/>

     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/junitTests/derbyNet"/>
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/junitTests/lang"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml?rev=396035&r1=396034&r2=396035&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
Fri Apr 21 16:51:52 2006
@@ -68,6 +68,7 @@
       </classpath>
       <include name="${this.dir}/*.java"/>
       <exclude name="${this.dir}/dataSourcePermissions_net.java"/>
+      <exclude name="${this.dir}/SqlExceptionTest.java"/>
     </javac>
   </target>
 
@@ -86,9 +87,11 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
+        <pathelement path="${junit}"/>
         <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${this.dir}/dataSourcePermissions_net.java"/>
+      <include name="${this.dir}/SqlExceptionTest.java"/>
     </javac>
   </target> 
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml?rev=396035&r1=396034&r2=396035&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
Fri Apr 21 16:51:52 2006
@@ -80,8 +80,8 @@
   </target>
   <target name="compilet2" depends="compilet3">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.3"
+      target="1.3"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml?rev=396035&r1=396034&r2=396035&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
Fri Apr 21 16:51:52 2006
@@ -42,7 +42,7 @@
 
 <!--             ============ Begin Targets ==============                -->
  
-  <target name="FTOtestsubdir" depends="compilet1,copyfiles"/>
+  <target name="FTOtestsubdir" depends="compilet1,compilet2,copyfiles"/>
 
   <!-- mkdir / init target may not be necessary, just here for reference... -->
   <target name="init">
@@ -68,6 +68,28 @@
         <pathelement path="${compile.classpath}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
+      <exclude name="${this.dir}/LobLimits.java"/>
+    </javac>
+  </target>
+
+  <target name="compilet2">
+    <javac
+      source="1.4"
+      target="1.4"
+      bootclasspath="${empty}"
+      nowarn="on"
+      debug="${debug}"
+      depend="${depend}"
+      deprecation="${deprecation}"
+      optimize="${optimize}"
+      proceed="${proceed}"
+      verbose="${verbose}" 
+      srcdir="${derby.testing.src.dir}"
+      destdir="${out.dir}">
+      <classpath>
+        <pathelement path="${java14compile.classpath}"/>
+      </classpath>
+      <include name="${this.dir}/LobLimits.java"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml?rev=396035&r1=396034&r2=396035&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
Fri Apr 21 16:51:52 2006
@@ -73,7 +73,7 @@
   </target>
 
   <target name="compilet2">
-    <javac
+    <!--javac
       source="1.4"
       target="1.4"
       bootclasspath="${empty}"
@@ -90,14 +90,13 @@
         <pathelement path="${java14compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
-      <!--exclude name=""/-->
-	<exclude name="**/jdbc4/*"/>
-      <!--include name=""/-->
-    </javac>
+      <exclude name="**/jdbc4/*"/>
+      <include name="${this.dir}/*.java">
+    </javac-->
   </target>
 
   <target name="compilet3">
-    <javac
+    <!--javac
       source="1.4"
       target="1.4"
       bootclasspath="${empty}"
@@ -113,8 +112,8 @@
       <classpath>
         <pathelement path="${java14compile.classpath}"/>
       </classpath>
-      <!--include name=""/-->
-    </javac>
+      <include name=""/>
+    </javac-->
   </target> 
 
   <target name="copyfiles">

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml?rev=396035&r1=396034&r2=396035&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
Fri Apr 21 16:51:52 2006
@@ -51,8 +51,8 @@
 
   <target name="compilet1">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -64,9 +64,8 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <!--pathelement location="${oro}"/-->
-        <pathelement path="${compile.classpath}"/>
-		<pathelement path="${junit}"/>
+        <pathelement path="${java14compile.classpath}"/>
+	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
     </javac>

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml?rev=396035&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml Fri Apr 21
16:51:52 2006
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+
+<!-- ==================================================================== -->
+<!--                       Cloudscape build file                          -->
+<!-- ==================================================================== -->
+
+<project default="unitTests" basedir="../../../../../..">
+
+<!-- ==================================================================== -->
+<!--                           Set properties                             -->
+<!-- ==================================================================== -->
+
+  <property name="properties.dir" value="tools/ant/properties"/>
+
+  <!-- User settings -->
+  <property file="${user.home}/ant.properties"/>
+
+  <!-- Significant dirs -->
+  <property file="${properties.dir}/dirs.properties"/>
+  <property file="${properties.dir}/derbytesting.properties"/>
+
+  <!-- Compiler settings -->
+  <property file="${properties.dir}/defaultcompiler.properties"/>
+  <property file="${properties.dir}/${build.compiler}.properties"/>
+
+  <!-- Parser properties -->
+  <property file="${properties.dir}/parser.properties"/>
+
+  <!-- Compile-time classpath properties files -->
+  <property file="${properties.dir}/extrapath.properties"/>
+  <property file="${properties.dir}/compilepath.properties"/>
+  <property file="${user.home}/properties/derbytesting.properties"/>
+  <property file="${ant.home}/properties/derbytesting.properties"/>
+
+  <!-- Release and Version info -->
+  <property file="${properties.dir}/release.properties"/>
+
+<!--             ============ Begin Targets ==============                -->
+ 
+  <target name="unitTests" 
+          description="Build Derby unit testing files">
+    <javac
+      source="1.3"
+      target="1.3"
+      bootclasspath="${empty}"
+      nowarn="on"
+      debug="${debug}"
+      depend="${depend}"
+      deprecation="${deprecation}"
+      optimize="${optimize}"
+      proceed="${proceed}"
+      verbose="${verbose}" 
+      srcdir="${derby.testing.src.dir}"
+      destdir="${out.dir}">
+      <classpath>
+        <pathelement path="${jta1_2}"/>
+        <pathelement path="${compile.classpath}"/>
+      </classpath>
+      <include name="${derby.testing.unittest.dir}/**/*.java"/>
+    </javac>
+  </target>
+
+<!--             ============= End Targets ==============                -->
+
+<!--             ============= End Project ==============                -->
+
+</project>

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/ant/properties/dirs.properties?rev=396035&r1=396034&r2=396035&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Fri Apr 21 16:51:52 2006
@@ -59,4 +59,5 @@
 derby.testing.dir=org/apache/derbyTesting
 derby.testing.out.dir=${out.dir}/${derby.testing.dir}
 derby.testing.functest.dir=${derby.testing.dir}/functionTests
+derby.testing.unittest.dir=${derby.testing.dir}/unitTests
 derby.testing.suites.dir=${derby.testing.functest.dir}/suites



Mime
View raw message