fix tests

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

@@ -1045,4 +1045,13 @@ public abstract class TestBase {
         }
     }
 
+    /**
+     * Get the classpath list used to execute java -cp ...
+     *
+     * @return the classpath list
+     */
+    protected String getClassPath() {
+        return "temp" + File.pathSeparator + "bin" + File.pathSeparator + ".";
+    }
+
 }

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

@@ -234,7 +234,7 @@ public abstract class TestHalt extends TestBase {
             // .;D:/data/java/hsqldb.jar;D:/data/java/derby.jar";
             String selfDestruct = SelfDestructor.getPropertyString(60);
             String[] procDef = new String[] { "java", selfDestruct,
-                    "-cp", "bin" + File.pathSeparator + ".",
+                    "-cp", getClassPath(),
                     getClass().getName(), "" + operations, "" + flags, "" + value};
             traceOperation("start: " + StringUtils.arrayCombine(procDef, ' '));
             Process p = Runtime.getRuntime().exec(procDef);

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

@@ -6,7 +6,6 @@
  */
 package org.h2.test.synth;
 
-import java.io.File;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -50,7 +49,7 @@ public class TestKill extends TestBase {
         String selfDestruct = SelfDestructor.getPropertyString(60);
         String[] procDef = new String[] {
                 "java", selfDestruct,
-                "-cp", "bin" + File.pathSeparator + ".",
+                "-cp", getClassPath(),
                 "org.h2.test.synth.TestKillProcess", url, user,
                 password, baseDir, "" + accounts };
 

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

@@ -6,7 +6,6 @@
  */
 package org.h2.test.synth;
 
-import java.io.File;
 import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -36,7 +35,7 @@ public class TestKillRestart extends TestBase {
         String user = getUser(), password = getPassword();
         String selfDestruct = SelfDestructor.getPropertyString(60);
         String[] procDef = new String[] { "java", selfDestruct,
-                "-cp", "bin" + File.pathSeparator + ".",
+                "-cp", getClassPath(),
                 getClass().getName(), "-url", url, "-user", user,
                 "-password", password };
 

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

@@ -6,7 +6,6 @@
  */
 package org.h2.test.synth;
 
-import java.io.File;
 import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -46,7 +45,7 @@ public class TestKillRestartMulti extends TestBase {
         password = getPassword();
         String selfDestruct = SelfDestructor.getPropertyString(60);
         String[] procDef = new String[] { "java", selfDestruct,
-                "-cp", "bin" + File.pathSeparator + ".",
+                "-cp", getClassPath(),
                 getClass().getName(), "-url", url, "-user", user,
                 "-password", password };
         deleteDb("killRestartMulti");

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

@@ -55,7 +55,7 @@ public class TestExit extends TestBase implements DatabaseEventListener {
             fail("did not close database");
         }
         procDef = new String[] { "java",
-                "-cp", "bin" + File.pathSeparator + ".", getClass().getName(),
+                "-cp", getClassPath(), getClass().getName(),
                 "" + OPEN_WITHOUT_CLOSE_ON_EXIT };
         proc = Runtime.getRuntime().exec(procDef);
         proc.waitFor();

h2/src/tools/org/h2/build/Build.java

@@ -104,7 +104,7 @@ public class Build extends BuildBase {
             File.pathSeparator + "ext/org.osgi.core-1.2.0.jar" +
             File.pathSeparator + "ext/slf4j-api-1.5.0.jar";
         exec("java", new String[] { "-Xmx128m", "-cp", cp, "emma", "run",
-                "-cp", "bin",
+                "-cp", "temp",
                 "-sp", "src/main",
                 "-r", "html,txt",
                 "-ix", "-org.h2.test.*,-org.h2.dev.*,-org.h2.jaqu.*,-org.h2.index.Page*,-org.h2.mode.*",