summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-06-21 12:07:06 +0200
committerStefan Zeiger <szeiger@novocode.com>2016-06-23 12:53:18 +0200
commit2d85fe47fddd3759db37e0106920688dcbceb7ef (patch)
tree1c84b98ede763daa8bfe81c4bf55dfd38b3d3343 /project
parente4c2d68fcf2aebe062faf2bdad08e07704b66d9a (diff)
downloadscala-2d85fe47fddd3759db37e0106920688dcbceb7ef.tar.gz
scala-2d85fe47fddd3759db37e0106920688dcbceb7ef.tar.bz2
scala-2d85fe47fddd3759db37e0106920688dcbceb7ef.zip
Fix test failures of the sbt build in 2.12.x
- More memory for compiling partest tests - Enable more detailed logging for partest failures: Partest’s `AntRunner` has extra code for logging details of all failed tests at the end of a run which is not present in `SbtRunner` but we can set the `--show-log` and `--show-diff` options to get similar output interspersed with the main test log. - Update OSGi test dependencies for sbt build to same versions as in ant (see 8247b8f077c96ba9a017b53de4d8062fe428c4a7 for the motivation for this change). - Disable MiMa checks (to be reactivated after M5).
Diffstat (limited to 'project')
-rw-r--r--project/ScriptCommands.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/project/ScriptCommands.scala b/project/ScriptCommands.scala
index b6565803b4..e5ff38617e 100644
--- a/project/ScriptCommands.scala
+++ b/project/ScriptCommands.scala
@@ -25,6 +25,7 @@ object ScriptCommands {
Project.extract(state).append(Seq(
resolvers in Global += "scala-pr" at url,
scalacOptions in Compile in ThisBuild += "-opt:l:classpath",
+ testOptions in IntegrationTest in LocalProject("test") ++= Seq(Tests.Argument("--show-log"), Tests.Argument("--show-diff")),
logLevel in ThisBuild := Level.Info,
logLevel in update in ThisBuild := Level.Warn
), state)