diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-10-20 05:47:34 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-10-20 05:47:34 -0700 |
| commit | ac72c9afb55b746f3135a8b3b2dbe0a2314c393a (patch) | |
| tree | 71b495a037c9db6cf9e61dce166ce22838e0f158 | |
| parent | 8848f241616627b0c5beca38a5107c4eca3e10fd (diff) | |
| parent | b6d39e0338292c8918348712f51bb7cf868622ad (diff) | |
| download | scala-ac72c9afb55b746f3135a8b3b2dbe0a2314c393a.tar.gz scala-ac72c9afb55b746f3135a8b3b2dbe0a2314c393a.tar.bz2 scala-ac72c9afb55b746f3135a8b3b2dbe0a2314c393a.zip | |
Merge pull request #3062 from xeno-by/topic/broken-windows
hotfix for reflection tests on Windows
| -rw-r--r-- | test/files/run/t6240a/Test.scala | 1 | ||||
| -rw-r--r-- | test/files/run/t6240b/Test.scala | 1 |
2 files changed, 0 insertions, 2 deletions
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 |