db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1494888 - /db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml
Date Thu, 20 Jun 2013 08:41:53 GMT
Author: kahatlen
Date: Thu Jun 20 08:41:53 2013
New Revision: 1494888

URL: http://svn.apache.org/r1494888
Log:
DERBY-6224: Many test failures on latest JDK 8 EA build because of missing SQLPermission

Compile the test against Java 5 libraries to prevent build issues when
jsr169compile.classpath is set.

Modified:
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml

Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml?rev=1494888&r1=1494887&r2=1494888&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml
(original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml
Thu Jun 20 08:41:53 2013
@@ -65,7 +65,7 @@
     <mkdir dir="${out.dir}/${derby.testing.functest.dir}/tests/engine"/>
   </target>
 
-  <target name="compilet1" >
+  <target name="compilet1" depends="compile_jdk5">
      <javac
         source="1.4"
         target="1.4"
@@ -84,9 +84,33 @@
            <pathelement path="${junit}"/>
         </classpath>
         <include name="${this.dir}/*.java"/>
+        <exclude name="${this.dir}/ShutdownWithoutDeregisterPermissionTest.java"/>
      </javac>
   </target>
 
+  <target name="compile_jdk5">
+     <javac
+        source="1.5"
+        target="1.5"
+        bootclasspath="${empty}"
+        nowarn="on"
+        debug="true"
+        depend="${depend}"
+        deprecation="${deprecation}"
+        optimize="${optimize}"
+        proceed="${proceed}"
+        verbose="${verbose}"
+        srcdir="${derby.testing.src.dir}"
+        destdir="${out.dir}">
+        <classpath>
+           <pathelement path="${java15compile.classpath}"/>
+           <pathelement path="${junit}"/>
+        </classpath>
+        <include name="${this.dir}/ShutdownWithoutDeregisterPermissionTest.java"/>
+     </javac>
+  </target>
+
+
   <target name="copyfiles">
     <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/engine">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/engine"



Mime
View raw message