Use current JVM in all tests

h2/src/test/org/h2/test/TestBase.java

@@ -6,6 +6,7 @@
 package org.h2.test;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -1317,6 +1318,16 @@ public abstract class TestBase {
         return System.getProperty("java.class.path");
     }
 
+    /**
+     * Get the path to a java executable of the current process
+     *
+     * @return the path to java
+     */
+    public static String getJVM() {
+        return System.getProperty("java.home") + File.separatorChar + "bin"
+                + File.separator + "java";
+    }
+
     /**
      * Use up almost all memory.
      *

h2/src/test/org/h2/test/TestDb.java

@@ -5,7 +5,6 @@
  */
 package org.h2.test;
 
-import java.io.File;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -191,16 +190,6 @@ public abstract class TestDb extends TestBase {
         // }
     }
 
-    /**
-     * Get the path to a java executable of the current process
-     *
-     * @return the path to java
-     */
-    private static String getJVM() {
-        return System.getProperty("java.home") + File.separatorChar + "bin"
-                + File.separator + "java";
-    }
-
     /**
      * Build a child process.
      *

h2/src/test/org/h2/test/db/TaskProcess.java

@@ -15,6 +15,8 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
+
+import org.h2.test.TestBase;
 import org.h2.test.utils.SelfDestructor;
 import org.h2.util.StringUtils;
 import org.h2.util.Task;
@@ -48,7 +50,7 @@ public class TaskProcess {
         try {
             String selfDestruct = SelfDestructor.getPropertyString(60);
             ArrayList<String> list = new ArrayList<>();
-            list.add("java");
+            list.add(TestBase.getJVM());
             list.add(selfDestruct);
             list.add("-cp");
             list.add("bin" + File.pathSeparator + ".");

h2/src/test/org/h2/test/poweroff/TestRecoverKillLoop.java

@@ -37,7 +37,7 @@ public class TestRecoverKillLoop extends TestBase {
         Random random = new Random(1);
         for (int i = 0; i < count; i++) {
             String[] procDef = {
-                    "java", "-cp", getClassPath(),
+                    getJVM(), "-cp", getClassPath(),
                     "-Dtest.dir=data/db",
                     TestRecover.class.getName()
             };

h2/src/test/org/h2/test/synth/TestHalt.java

@@ -226,7 +226,7 @@ public abstract class TestHalt extends TestBase {
             // String classPath = "-cp
             // .;D:/data/java/hsqldb.jar;D:/data/java/derby.jar";
             String selfDestruct = SelfDestructor.getPropertyString(60);
-            String[] procDef = { "java", selfDestruct,
+            String[] procDef = { getJVM(), selfDestruct,
                     "-cp", getClassPath(),
                     getClass().getName(), "" + operations, "" + flags, "" + testValue};
             traceOperation("start: " + StringUtils.arrayCombine(procDef, ' '));

h2/src/test/org/h2/test/synth/TestKill.java

@@ -50,7 +50,7 @@ public class TestKill extends TestDb {
         String password = getPassword();
         String selfDestruct = SelfDestructor.getPropertyString(60);
         String[] procDef = {
-                "java", selfDestruct,
+                getJVM(), selfDestruct,
                 "-cp", getClassPath(),
                 "org.h2.test.synth.TestKillProcess", url, user,
                 password, getBaseDir(), "" + ACCOUNTS };

h2/src/test/org/h2/test/synth/TestKillRestart.java

@@ -16,7 +16,6 @@ import java.sql.Statement;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import org.h2.test.TestBase;
 import org.h2.test.TestDb;
 import org.h2.test.utils.SelfDestructor;
 
@@ -40,7 +39,7 @@ public class TestKillRestart extends TestDb {
         //        "killRestart;CACHE_SIZE=2048;WRITE_DELAY=0", true);
         String user = getUser(), password = getPassword();
         String selfDestruct = SelfDestructor.getPropertyString(60);
-        String[] procDef = { "java", selfDestruct,
+        String[] procDef = { getJVM(), selfDestruct,
                 "-cp", getClassPath(),
                 getClass().getName(), "-url", url, "-user", user,
                 "-password", password };

h2/src/test/org/h2/test/synth/TestKillRestartMulti.java

@@ -83,7 +83,7 @@ public class TestKillRestartMulti extends TestDb {
         // Inherit error so that the stacktraces reported from SelfDestructor
         // show up in our log.
         ProcessBuilder pb = new ProcessBuilder().redirectError(Redirect.INHERIT)
-                .command("java", selfDestruct, "-cp", getClassPath(),
+                .command(getJVM(), selfDestruct, "-cp", getClassPath(),
                         "-ea",
                         getClass().getName(), "-url", url, "-user", user,
                         "-password", password);

h2/src/test/org/h2/test/unit/TestExit.java

@@ -37,7 +37,7 @@ public class TestExit extends TestDb {
         deleteDb("exit");
         String url = getURL(OPEN_WITH_CLOSE_ON_EXIT);
         String selfDestruct = SelfDestructor.getPropertyString(60);
-        String[] procDef = { "java", selfDestruct, "-cp", getClassPath(),
+        String[] procDef = { getJVM(), selfDestruct, "-cp", getClassPath(),
                 getClass().getName(), url };
         Process proc = Runtime.getRuntime().exec(procDef);
         while (true) {
@@ -60,7 +60,7 @@ public class TestExit extends TestDb {
             fail("did not close database");
         }
         url = getURL(OPEN_WITHOUT_CLOSE_ON_EXIT);
-        procDef = new String[] { "java", "-cp", getClassPath(),
+        procDef = new String[] { getJVM(), "-cp", getClassPath(),
                 getClass().getName(), url };
         proc = Runtime.getRuntime().exec(procDef);
         proc.waitFor();

h2/src/test/org/h2/test/unit/TestFileLockProcess.java

@@ -74,7 +74,7 @@ public class TestFileLockProcess extends TestDb {
         url = getURL(url, true);
         Connection conn = getConnection(url);
         String selfDestruct = SelfDestructor.getPropertyString(60);
-        String[] procDef = { "java", selfDestruct,
+        String[] procDef = { getJVM(), selfDestruct,
                 "-cp", getClassPath(),
                 getClass().getName(), url };
         ArrayList<Process> processes = new ArrayList<>(count);