diff options
Diffstat (limited to 'scalalib')
-rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 5 | ||||
-rw-r--r-- | scalalib/test/src/mill/scalalib/HelloWorldTests.scala | 6 | ||||
-rw-r--r-- | scalalib/test/src/mill/scalalib/ResolveDepsTests.scala | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 23d7345b..b81cc94a 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -268,7 +268,10 @@ object TestModule{ } else { val grouped = badStatuses.groupBy(x => x).mapValues(_.length).toList.sorted - Result.Failure(grouped.map{case (k, v) => k + ": " + v}.mkString(",")) + Result.Failure( + grouped.map{case (k, v) => k + ": " + v}.mkString(","), + Some((doneMsg, results)) + ) } } } diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala index 6fc26b03..24527cf1 100644 --- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala +++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala @@ -199,7 +199,7 @@ object HelloWorldTests extends TestSuite { 'failOnError - workspaceTest(HelloWorld){eval => write.append(HelloWorld.millSourcePath / 'core / 'src / "Main.scala", "val x: ") - val Left(Result.Failure("Compilation failed")) = eval.apply(HelloWorld.core.compile) + val Left(Result.Failure("Compilation failed", _)) = eval.apply(HelloWorld.core.compile) val paths = Evaluator.resolveDestPaths( @@ -221,7 +221,7 @@ object HelloWorldTests extends TestSuite { } 'passScalacOptions - workspaceTest(HelloWorldFatalWarnings){ eval => // compilation fails because of "-Xfatal-warnings" flag - val Left(Result.Failure("Compilation failed")) = eval.apply(HelloWorldFatalWarnings.core.compile) + val Left(Result.Failure("Compilation failed", _)) = eval.apply(HelloWorldFatalWarnings.core.compile) } } @@ -271,7 +271,7 @@ object HelloWorldTests extends TestSuite { 'notRunWhenCompileFailed - workspaceTest(HelloWorld){eval => write.append(HelloWorld.millSourcePath / 'core / 'src / "Main.scala", "val x: ") - val Left(Result.Failure("Compilation failed")) = eval.apply(HelloWorld.core.runMain("Main")) + val Left(Result.Failure("Compilation failed", _)) = eval.apply(HelloWorld.core.runMain("Main")) } } diff --git a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala b/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala index f697127c..6eb9a014 100644 --- a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala +++ b/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala @@ -21,19 +21,19 @@ object ResolveDepsTests extends TestSuite { 'errOnInvalidOrgDeps - { val deps = Agg(ivy"xxx.yyy.invalid::pprint:0.5.3") - val Failure(errMsg) = evalDeps(deps) + val Failure(errMsg, _) = evalDeps(deps) assert(errMsg.contains("xxx.yyy.invalid")) } 'errOnInvalidVersionDeps - { val deps = Agg(ivy"com.lihaoyi::pprint:invalid.version.num") - val Failure(errMsg) = evalDeps(deps) + val Failure(errMsg, _) = evalDeps(deps) assert(errMsg.contains("invalid.version.num")) } 'errOnPartialSuccess - { val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3", ivy"fake::fake:fake") - val Failure(errMsg) = evalDeps(deps) + val Failure(errMsg, _) = evalDeps(deps) assert(errMsg.contains("fake")) } } |