diff options
| author | Philipp Haller <hallerp@gmail.com> | 2008-09-17 12:42:14 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2008-09-17 12:42:14 +0000 |
| commit | 6bdefe4aec1abb28f8aaed8c31d835ce9669e912 (patch) | |
| tree | 9e4ef1526e66cf4c20223b92965c3252fe69db4d /src/partest | |
| parent | 7d5d4995bdb51288c7dde3481b503b95df588014 (diff) | |
| download | scala-6bdefe4aec1abb28f8aaed8c31d835ce9669e912.tar.gz scala-6bdefe4aec1abb28f8aaed8c31d835ce9669e912.tar.bz2 scala-6bdefe4aec1abb28f8aaed8c31d835ce9669e912.zip | |
Fixed java options.
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/ConsoleRunner.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/FileManager.scala | 1 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala index efea481609..668b2d0a45 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala @@ -147,7 +147,7 @@ class ConsoleRunner extends DirectRunner with RunnerUtils { val vmName = System.getProperty("java.vm.name", "")+" (build "+ System.getProperty("java.vm.version", "")+", "+ System.getProperty("java.vm.info", "")+")" - val vmOpts = System.getProperty("scalatest.java_options", "?") + val vmOpts = fileManager.JAVA_OPTS NestUI.outline("Java binaries in: "+vmBin+"\n") NestUI.outline("Java runtime is: "+vmName+"\n") NestUI.outline("Java options are: "+vmOpts+"\n") diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala index d58616c6c8..1c69bc7527 100644 --- a/src/partest/scala/tools/partest/nest/FileManager.scala +++ b/src/partest/scala/tools/partest/nest/FileManager.scala @@ -60,6 +60,7 @@ trait FileManager { var failed = false var SCALAC_OPTS = System.getProperty("scalatest.scalac_opts", "-deprecation") + var JAVA_OPTS = System.getProperty("scalatest.java_opts", "") var timeout = "1200000" } diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index feda0ea79f..2e856b956e 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -215,6 +215,7 @@ class Worker(val fileManager: FileManager) extends Actor { val cmd = JAVACMD+ " "+argString+ + " "+JAVA_OPTS+ " -classpath "+outDir+File.pathSeparator+CLASSPATH+ " -Djava.library.path="+logFile.getParentFile.getAbsolutePath+ " -Dscalatest.output="+outDir.getAbsolutePath+ |