diff options
| author | Philipp Haller <hallerp@gmail.com> | 2010-11-15 16:53:45 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2010-11-15 16:53:45 +0000 |
| commit | 8006c997922d84db97156f6a6a635e19433ba0b0 (patch) | |
| tree | a3913e70650c8a5f2bbe341683e9d6a8574169f2 | |
| parent | d0d20f5b63cc0213446b6963dab60c0829c05d6f (diff) | |
| download | scala-8006c997922d84db97156f6a6a635e19433ba0b0.tar.gz scala-8006c997922d84db97156f6a6a635e19433ba0b0.tar.bz2 scala-8006c997922d84db97156f6a6a635e19433ba0b0.zip | |
partest sets javaccmd system property when runn...
partest sets javaccmd system property when running tests. Review by
dragos.
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 0c12f7cad8..3fba5ff39e 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -109,6 +109,12 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor var reporter: ConsoleReporter = _ val timer = new Timer + val javacCmd = if ((fileManager.JAVAC_CMD.indexOf("${env.JAVA_HOME}") != -1) || + fileManager.JAVAC_CMD.equals("/bin/javac") || + fileManager.JAVAC_CMD.equals("\\bin\\javac")) "javac" + else + fileManager.JAVAC_CMD + def error(msg: String): Unit = reporter.error( FakePos("scalac"), msg + "\n scalac -help gives more information" @@ -221,13 +227,6 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor def javac(outDir: File, files: List[File], output: File): Boolean = { // compile using command-line javac compiler - val javacCmd = if ((fileManager.JAVAC_CMD.indexOf("${env.JAVA_HOME}") != -1) || - fileManager.JAVAC_CMD.equals("/bin/javac") || - fileManager.JAVAC_CMD.equals("\\bin\\javac")) - "javac" - else - fileManager.JAVAC_CMD - val cmd = javacCmd+ " -d "+outDir.getAbsolutePath+ " -classpath "+ join(outDir.toString, CLASSPATH) + @@ -304,6 +303,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor "-Dpartest.lib="+LATEST_LIB, "-Dpartest.cwd="+outDir.getParent, "-Djavacmd="+JAVACMD, + "-Djavaccmd="+javacCmd, "-Duser.language=en -Duser.country=US" ) ::: ( if (isPartestDebug) List("-Dpartest.debug=true") else Nil |