diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-04 21:00:00 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-04 21:00:00 -0800 |
commit | fb68da0e6803f2f8eb948515672bd2297aaa1709 (patch) | |
tree | 0bb086b005fbe96f8e68e4c2f4baf20706d48d6e /scalalib | |
parent | 53f55cbba68617ff1a96c77ebb061276e4c8248d (diff) | |
download | mill-fb68da0e6803f2f8eb948515672bd2297aaa1709.tar.gz mill-fb68da0e6803f2f8eb948515672bd2297aaa1709.tar.bz2 mill-fb68da0e6803f2f8eb948515672bd2297aaa1709.zip |
First pass at a ticker-based progress logger to reduce the spamminess of the console
Diffstat (limited to 'scalalib')
-rw-r--r-- | scalalib/src/main/scala/mill/scalalib/Module.scala | 3 | ||||
-rw-r--r-- | scalalib/src/main/scala/mill/scalalib/TestRunner.scala | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/scalalib/src/main/scala/mill/scalalib/Module.scala b/scalalib/src/main/scala/mill/scalalib/Module.scala index 3cd4cde0..c6fcfb4d 100644 --- a/scalalib/src/main/scala/mill/scalalib/Module.scala +++ b/scalalib/src/main/scala/mill/scalalib/Module.scala @@ -39,7 +39,8 @@ trait TestModule extends Module with TaskModule { (runDepClasspath().map(_.path) :+ compile().classes.path).distinct.mkString(" "), Seq(compile().classes.path).mkString(" "), args.mkString(" "), - outputPath.toString + outputPath.toString, + T.ctx().log.colored.toString ), workingDir = forkWorkingDir ) diff --git a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala index 734bc1e0..304ae989 100644 --- a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala +++ b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala @@ -6,11 +6,13 @@ import java.net.URLClassLoader import java.util.zip.ZipInputStream import ammonite.ops.{Path, ls, pwd} +import ammonite.util.Colors import mill.util.Ctx.LogCtx import mill.util.PrintLogger import sbt.testing._ import upickle.Js import mill.util.JsonFormatters._ + import scala.collection.mutable object TestRunner { @@ -49,7 +51,13 @@ object TestRunner { entireClasspath = args(1).split(" ").map(Path(_)), testClassfilePath = args(2).split(" ").map(Path(_)), args = args(3) match{ case "" => Nil case x => x.split(" ").toList } - )(new PrintLogger(true, System.err, System.err)) + )(new PrintLogger( + args(5) == "true", + if(args(5) == "true") Colors.Default + else Colors.BlackWhite, + System.err, + System.err + )) val outputPath = args(4) ammonite.ops.write(Path(outputPath), upickle.default.write(result)) |