diff options
author | Guillaume Martres <smarter@ubuntu.com> | 2016-02-11 13:28:32 +0100 |
---|---|---|
committer | Guillaume Martres <smarter@ubuntu.com> | 2016-02-11 13:39:56 +0100 |
commit | d57fd8bc9fc9eadf620b29a89a69b7d974a7ec65 (patch) | |
tree | 0c584961a3fb56a19a1a6bf09949a54c4c6ff4f7 /test/dotty | |
parent | 13b61653439700ca6607074bcded4d714131bdc2 (diff) | |
download | dotty-d57fd8bc9fc9eadf620b29a89a69b7d974a7ec65.tar.gz dotty-d57fd8bc9fc9eadf620b29a89a69b7d974a7ec65.tar.bz2 dotty-d57fd8bc9fc9eadf620b29a89a69b7d974a7ec65.zip |
partest: run tests with -Xms64M -Xmx1024M instead of JVM defaults
This is the same settings that scalac uses, this should help use avoid
using too much memory (the default on 64 bits Linux seems to be
-Xms248M -Xmx3938M).
Diffstat (limited to 'test/dotty')
-rw-r--r-- | test/dotty/partest/DPConfig.scala | 8 | ||||
-rw-r--r-- | test/dotty/partest/DPConsoleRunner.scala | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/test/dotty/partest/DPConfig.scala b/test/dotty/partest/DPConfig.scala index 12453b450..79f41340c 100644 --- a/test/dotty/partest/DPConfig.scala +++ b/test/dotty/partest/DPConfig.scala @@ -4,6 +4,8 @@ import scala.collection.JavaConversions._ import scala.reflect.io.Path import java.io.File +import scala.tools.partest.PartestDefaults + /** Dotty Partest runs all tests in the provided testDirs located under * testRoot. There can be several directories with pos resp. neg tests, as @@ -15,6 +17,12 @@ import java.io.File * otherwise pos/__defaultFlags.flags are used if the file exists). */ object DPConfig { + /** Options used for _running_ the run tests. + * Note that this is different from the options used when _compiling_ tests, + * those are determined by the sbt configuration. + */ + val runJVMOpts = s"-Xms64M -Xmx1024M ${PartestDefaults.javaOpts}" + val testRoot = (Path(".") / Path("tests") / Path("partest-generated")).toString val genLog = Path(testRoot) / Path("gen.log") diff --git a/test/dotty/partest/DPConsoleRunner.scala b/test/dotty/partest/DPConsoleRunner.scala index fa6256398..baa62579c 100644 --- a/test/dotty/partest/DPConsoleRunner.scala +++ b/test/dotty/partest/DPConsoleRunner.scala @@ -65,8 +65,9 @@ class DPSuiteRunner(testSourcePath: String, // relative path, like "files", or " consoleArgs: String, javaCmdPath: String = PartestDefaults.javaCmd, javacCmdPath: String = PartestDefaults.javacCmd, - scalacExtraArgs: Seq[String] = Seq.empty) -extends SuiteRunner(testSourcePath, fileManager, updateCheck, failed, javaCmdPath, javacCmdPath, scalacExtraArgs) { + scalacExtraArgs: Seq[String] = Seq.empty, + javaOpts: String = DPConfig.runJVMOpts) +extends SuiteRunner(testSourcePath, fileManager, updateCheck, failed, javaCmdPath, javacCmdPath, scalacExtraArgs, javaOpts) { if (!DPConfig.runTestsInParallel) sys.props("partest.threads") = "1" |