db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r501341 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools: derbyrunjartest.java derbyrunjartest_app.properties
Date Tue, 30 Jan 2007 08:26:47 GMT
Author: myrnavl
Date: Tue Jan 30 00:26:46 2007
New Revision: 501341

URL: http://svn.apache.org/viewvc?view=rev&rev=501341
Log:
DERBY-1606 - derbyrunjartest hangs or uses wrong spawned jvm class 
  if code no longer required as we only support foundation and have moved
  the canons so only j9_foundation11 will run without failures; 
  test passes cleanly with weme6.1 (j9 2.3/j2ME 1.1), so no need to skip

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest_app.properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java?view=diff&rev=501341&r1=501340&r2=501341
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
Tue Jan 30 00:26:46 2007
@@ -53,13 +53,7 @@
             derbyrunloc = result.toString().substring(5);
             if (System.getProperty("os.name").startsWith("Windows"))
               derbyrunloc = derbyrunloc.substring(1);
-
-            if ((System.getProperty("java.vm.name") != null) &&
-                    System.getProperty("java.vm.name").equals("J9")) {
-                jvm = jvm.getJvm("j9_13");
-            } else {
-                jvm = jvm.getJvm("currentjvm"); // ensure compatibility
-            }
+            jvm = jvm.getJvm("currentjvm"); // ensure compatibility
         }
 
         String[][] testCommands = new String[][] {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest_app.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest_app.properties?view=diff&rev=501341&r1=501340&r2=501341
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest_app.properties
Tue Jan 30 00:26:46 2007
@@ -1,7 +1,2 @@
 # Disabling processes because test spawns child threads using Runtime.exec().
 noSecurityManager=true
-
-# skipping this test with j9 and j9_foundation because test currently forces to
-# j9_13 and causes hangs on those jvms. See DERBY-1606.
-runwithj9=false
-runwithfoundation=false



Mime
View raw message