luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce memory of scripted tests + extra 

* Remove oversight in error message
* Up the memory limit per scripted instance
This commit is contained in:
jvican 2017-04-29 01:56:37 +02:00
parent b923f12cc8
commit 5ca2e3c87e
No known key found for this signature in database
GPG Key ID: 42DAFA0F112E8050
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -352,7 +352,7 @@ def otherRootSettings =
scriptedUnpublished := scriptedUnpublishedTask.evaluated,
scriptedSource := (sourceDirectory in sbtProj).value / "sbt-test",
// scriptedPrescripted := { addSbtAlternateResolver _ },
scriptedLaunchOpts := List("-XX:MaxPermSize=256M", "-Xmx1G"),
scriptedLaunchOpts := List("-XX:MaxPermSize=256M", "-Xmx360M"),
publishAll := { val _ = (publishLocal).all(ScopeFilter(inAnyProject)).value },
publishLocalBinAll := { val _ = (publishLocalBin).all(ScopeFilter(inAnyProject)).value },
aggregate in bintrayRelease := false
@ -363,7 +363,7 @@ def otherRootSettings =
},
scriptedLaunchOpts := {
List("-XX:MaxPermSize=256M",
"-Xmx1G",
"-Xmx512M",
"-Dsbt.override.build.repos=true",
s"""-Dsbt.repository.config=${scriptedSource.value / "repo.config"}""")
},

2
scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
View File

@ -79,7 +79,7 @@ final class ScriptedTests(resourceBaseDirectory: File,
val pendingMark = if (pending) PendingLabel else ""
def testFailed(t: Throwable): Option[String] = {
if (pending) buffered.clear() else buffered.stop()
buffered.error(s"x $label $pendingMark" + label + pendingMark)
buffered.error(s"x $label $pendingMark")
if (!NonFatal(t)) throw t // We make sure fatal errors are rethrown
if (t.isInstanceOf[TestException]) {
t.getCause match {