From b6d39e0338292c8918348712f51bb7cf868622ad Mon Sep 17 00:00:00 2001 From: Eugene Burmako Date: Sun, 20 Oct 2013 14:34:35 +0200 Subject: hotfix for reflection tests on Windows Removes the Unix-specific command-line sanity check put in place in recently committed reflection tests. On Windows, something like `C:\Java\jdk1.6.0_24-x64\jre\bin\java` might be a valid command (pointing to `java.exe` or `java.bat`) even if the eponymous file does not exist. --- test/files/run/t6240a/Test.scala | 1 - test/files/run/t6240b/Test.scala | 1 - 2 files changed, 2 deletions(-) (limited to 'test') diff --git a/test/files/run/t6240a/Test.scala b/test/files/run/t6240a/Test.scala index 6ae43c4809..05c3678cbe 100644 --- a/test/files/run/t6240a/Test.scala +++ b/test/files/run/t6240a/Test.scala @@ -11,6 +11,5 @@ object Test extends App { 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") - assert(new File(javaBinary).exists, javaBinary) List(javaBinary, "-cp", testClassesDir, "-Dlaunch.classpath=" + fullTestClassesClasspath, "StepOne").! } \ No newline at end of file diff --git a/test/files/run/t6240b/Test.scala b/test/files/run/t6240b/Test.scala index 6ae43c4809..05c3678cbe 100644 --- a/test/files/run/t6240b/Test.scala +++ b/test/files/run/t6240b/Test.scala @@ -11,6 +11,5 @@ object Test extends App { 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") - assert(new File(javaBinary).exists, javaBinary) List(javaBinary, "-cp", testClassesDir, "-Dlaunch.classpath=" + fullTestClassesClasspath, "StepOne").! } \ No newline at end of file -- cgit v1.2.3