Run tests as they were in scala.

3 files changed, 63 insertions, 0 deletions

diff --git a/tests/pending/run/t6240a/StepOne.java b/tests/pending/run/t6240a/StepOne.java
new file mode 100644
index 000000000..342d617c7
--- /dev/null
+++ b/tests/pending/run/t6240a/StepOne.java
@@ -0,0 +1,41 @@
+import java.io.File;
+import java.io.IOException;
+import java.lang.ClassNotFoundException;
+import java.lang.NoSuchMethodException;
+import java.lang.IllegalAccessException;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.MalformedURLException;
+
+public class StepOne {
+  public static void main(String[] args)
+  throws MalformedURLException, ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, IOException {
+    String[] launchPaths = System.getProperty("launch.classpath").split(File.pathSeparator);
+
+    // move away StepThree
+    File tempDir = File.createTempFile("temp", Long.toString(System.nanoTime()));
+    System.setProperty("launch.step.three", tempDir.getAbsolutePath());
+    tempDir.delete();
+    tempDir.mkdir();
+    File[] testClasses = new File(launchPaths[0]).listFiles();
+    for (int i = 0; i < testClasses.length; i++) {
+      File testClass = testClasses[i];
+      if (testClass.getPath().contains("StepThree")) {
+        File testClassMoved = new File(tempDir.getAbsolutePath() + "/" + testClass.getName());
+        testClass.renameTo(testClassMoved);
+      }
+    }
+
+    // launch StepTwo
+    URL[] launchURLs = new URL[launchPaths.length];
+    for (int i = 0; i < launchPaths.length; i++) {
+      launchURLs[i] = new File(launchPaths[i]).toURL();
+    }
+    URLClassLoader classLoader = new URLClassLoader(launchURLs, Object.class.getClassLoader());
+    Class<?> stepTwo = classLoader.loadClass("StepTwo");
+    Method main = stepTwo.getDeclaredMethod("main", String[].class);
+    main.invoke(null, (Object)(new String[]{}));
+  }
+}
diff --git a/tests/pending/run/t6240a/StepTwo.scala b/tests/pending/run/t6240a/StepTwo.scala
new file mode 100644
index 000000000..fc3221921
--- /dev/null
+++ b/tests/pending/run/t6240a/StepTwo.scala
@@ -0,0 +1,7 @@
+import java.io.File
+import java.net.URLClassLoader
+
+object StepTwo extends App {
+  import scala.reflect.runtime.universe._
+  println(typeOf[StepTwo.type])
+}
\ No newline at end of file
diff --git a/tests/pending/run/t6240a/Test.scala b/tests/pending/run/t6240a/Test.scala
new file mode 100644
index 000000000..05c3678cb
--- /dev/null
+++ b/tests/pending/run/t6240a/Test.scala
@@ -0,0 +1,15 @@
+import java.io.File
+import scala.sys.process._
+
+object Test extends App {
+  def prop(key: String) = {
+    val value = System.getProperties.getProperty(key)
+    assert(value != null, key)
+    value
+  }
+  val testClassesDir = prop("partest.output")
+  assert(new File(testClassesDir).exists, testClassesDir)
+  val fullTestClassesClasspath = testClassesDir + prop("path.separator") + prop("java.class.path")
+  val javaBinary = if (new File(prop("javacmd")).isAbsolute) prop("javacmd") else prop("java.home") + "/bin/" + prop("javacmd")
+  List(javaBinary, "-cp", testClassesDir, "-Dlaunch.classpath=" + fullTestClassesClasspath, "StepOne").!
+}
\ No newline at end of file