Here is a .diff with 2 minor changes:
- a typo in functionTests/harness/SysInfoLog
- an entry forgotten from functionTests/tests/jdbcapi/copyfiles.ant, causing test autoGeneratedJdbc30 incorrectly to be run with jvms based on jdk13 spec.


Myrna
Index: 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
===================================================================
--- 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant  
    (revision 152936)
+++ 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant  
    (working copy)
@@ -1,4 +1,5 @@
 aclob.txt
+autoGeneratedJdbc30_app.properties
 batchUpdate_derby.properties
 blobclob4BLOB_app.properties
 blobclob4BLOB_derby.properties
Index: 
java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java  
(revision 152936)
+++ java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java  
(working copy)
@@ -54,7 +54,7 @@
                 if ( (jvmName == null) || (jvmName.length()==0) )
                     jvmName = "jdk13";
                 else if (jvmName.startsWith("jdk13"))
-                    jvmName = "jdk31";
+                    jvmName = "jdk13";
 
                                javavm = jvm.getJvm(jvmName);
                 if (javaCmd != null)

Reply via email to