diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2010-04-29 13:45:47 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2010-04-29 13:45:47 +0000 |
| commit | 4bd4c7f4d47d85d5c3daaa5f3850466197b08f1c (patch) | |
| tree | f2427563d6d9c7a7f04cf34b264c394069ca7ca9 /src/partest | |
| parent | a2c3cdf668951cf861dada3623afba85647ee6ad (diff) | |
| download | scala-4bd4c7f4d47d85d5c3daaa5f3850466197b08f1c.tar.gz scala-4bd4c7f4d47d85d5c3daaa5f3850466197b08f1c.tar.bz2 scala-4bd4c7f4d47d85d5c3daaa5f3850466197b08f1c.zip | |
Reverted change that made partest fail with 'bi...
Reverted change that made partest fail with 'bin/javac: no such file'
when JAVA_HOME was not set (instead of using the javac on the PATH).
Reviewed by extempore, so no review.
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/Config.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/Config.scala b/src/partest/scala/tools/partest/Config.scala index 2ed096d930..288a3034e9 100644 --- a/src/partest/scala/tools/partest/Config.scala +++ b/src/partest/scala/tools/partest/Config.scala @@ -15,7 +15,7 @@ trait Config { lazy val src = absolutize(srcDir).toDirectory lazy val build = new TestBuild() - def javaHomeEnv = envOrElse("JAVA_HOME", "") + def javaHomeEnv = envOrElse("JAVA_HOME", null) def javaCmd = envOrElse("JAVACMD", "java") def javacCmd = Option(javaHomeEnv) map (x => Path(x) / "bin" / "javac" path) getOrElse "javac" |