summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-04 10:29:29 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-04 10:29:29 -0800
commite34b2cd25ced6dfef6dbcbcadcfed978494f2630 (patch)
tree5bfa5560d874d507d2a27e921d5489f1f39e09c0
parentce0a5c2869da538b79d6adb9e28dd46741953889 (diff)
downloadmill-e34b2cd25ced6dfef6dbcbcadcfed978494f2630.tar.gz
mill-e34b2cd25ced6dfef6dbcbcadcfed978494f2630.tar.bz2
mill-e34b2cd25ced6dfef6dbcbcadcfed978494f2630.zip
Fix ScalaWorker test runs to make them properly break the build
-rw-r--r--core/test/src/mill/eval/CrossTests.scala2
-rw-r--r--scalalib/src/mill/scalalib/ScalaModule.scala9
2 files changed, 7 insertions, 4 deletions
diff --git a/core/test/src/mill/eval/CrossTests.scala b/core/test/src/mill/eval/CrossTests.scala
index c9f7cb70..753cf369 100644
--- a/core/test/src/mill/eval/CrossTests.scala
+++ b/core/test/src/mill/eval/CrossTests.scala
@@ -26,7 +26,7 @@ object CrossTests extends TestSuite{
val Right(("2.12", 1)) = check.apply(crossResolved.foo("2.12").suffix)
val Right(("_2.10", 1)) = check.apply(crossResolved.bar("2.10").longSuffix)
- val Right(("_2.11", 1)) = check.apply(crossResolved.bar("2.11").longSuffix)
+ val Right(("_211", 1)) = check.apply(crossResolved.bar("2.11").longSuffix)
val Right(("_2.12", 1)) = check.apply(crossResolved.bar("2.12").longSuffix)
}
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index a5637220..23d7345b 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -261,9 +261,12 @@ trait ScalaModule extends mill.Module with TaskModule { outer =>
object TestModule{
def handleResults(doneMsg: String, results: Seq[TestRunner.Result]) = {
- if (results.count(Set("Error", "Failure")) == 0) Result.Success((doneMsg, results))
- else {
- val grouped = results.map(_.status).groupBy(x => x).mapValues(_.length).filter(_._2 != 0).toList.sorted
+
+ val badStatuses = results.map(_.status).filter(Set("Error", "Failure"))
+ if (badStatuses.isEmpty) {
+ Result.Success((doneMsg, results))
+ } else {
+ val grouped = badStatuses.groupBy(x => x).mapValues(_.length).toList.sorted
Result.Failure(grouped.map{case (k, v) => k + ": " + v}.mkString(","))
}