From 5d4bcaa20375657afa7c59826e02fd738a6750e1 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Wed, 31 Aug 2016 15:33:53 +1000 Subject: Workaround sbt bug when partest itself throws Discussion: https://github.com/sbt/sbt/issues/2722 This commit checks that some test events exist in the test log for `test/it:test` before trusting the result of `Success`. --- build.sbt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index b2a27bcc6f..c5dce18b84 100644 --- a/build.sbt +++ b/build.sbt @@ -675,7 +675,17 @@ lazy val test = project def isModule = true def annotationName = "partest" }, true, Array() - ) + ), + executeTests in IntegrationTest := { + val result = (executeTests in IntegrationTest).value + if (result.overall != TestResult.Error && result.events.isEmpty) { + // workaround for https://github.com/sbt/sbt/issues/2722 + val result = (executeTests in Test).value + (streams.value.log.error("No test events found")) + result.copy(overall = TestResult.Error) + } + else result + } ) lazy val manual = configureAsSubproject(project) -- cgit v1.2.3 From 1292e61ba654921971e2f403f11a4b1f901a94d7 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Wed, 31 Aug 2016 15:33:53 +1000 Subject: Use STARR library for ManMaker --- build.sbt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index c5dce18b84..9fdd40a1f6 100644 --- a/build.sbt +++ b/build.sbt @@ -692,10 +692,9 @@ lazy val manual = configureAsSubproject(project) .settings(disableDocs: _*) .settings(disablePublishing: _*) .settings( - libraryDependencies ++= Seq(scalaXmlDep, antDep), + libraryDependencies ++= Seq(scalaXmlDep, antDep, "org.scala-lang" % "scala-library" % scalaVersion.value), classDirectory in Compile := (target in Compile).value / "classes" ) - .dependsOn(library) lazy val libraryAll = Project("library-all", file(".") / "target" / "library-all-src-dummy") .settings(commonSettings: _*) -- cgit v1.2.3