From bd979b5ab9aa3bc479c7800f41393e53b24aae74 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 1 Jan 2018 09:50:57 -0800 Subject: Pipe in stdin and stderr. We still need to figure out a policy for how stderr/stdout map to the various `Logger` levels, but for now this shuts up the integration tests --- scalalib/src/main/scala/mill/scalalib/GenIdea.scala | 6 +++--- scalalib/src/main/scala/mill/scalalib/TestRunner.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scalalib') diff --git a/scalalib/src/main/scala/mill/scalalib/GenIdea.scala b/scalalib/src/main/scala/mill/scalalib/GenIdea.scala index 8b89fa9a..99d8a9ad 100644 --- a/scalalib/src/main/scala/mill/scalalib/GenIdea.scala +++ b/scalalib/src/main/scala/mill/scalalib/GenIdea.scala @@ -5,19 +5,19 @@ import mill.define.Target import mill.discover.Mirror.Segment import mill.discover.{Discovered, Mirror} import mill.eval.{Evaluator, PathRef} -import mill.util.Ctx.LoaderCtx +import mill.util.Ctx.{LoaderCtx, LogCtx} import mill.util.{OSet, PrintLogger} object GenIdea { - def apply()(implicit ctx: LoaderCtx): Unit = { + def apply()(implicit ctx: LoaderCtx with LogCtx): Unit = { val mapping = ctx.load(mill.discover.Discovered.Mapping) val pp = new scala.xml.PrettyPrinter(999, 4) rm! pwd/".idea" rm! pwd/".idea_modules" - val evaluator = new Evaluator(pwd / 'out, pwd, mapping, new PrintLogger(true)) + val evaluator = new Evaluator(pwd / 'out, pwd, mapping, ctx.log) for((relPath, xml) <- xmlFileLayout(evaluator)){ write.over(pwd/relPath, pp.format(xml)) diff --git a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala index b734273f..734bc1e0 100644 --- a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala +++ b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala @@ -49,7 +49,7 @@ 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)) + )(new PrintLogger(true, System.err, System.err)) val outputPath = args(4) ammonite.ops.write(Path(outputPath), upickle.default.write(result)) -- cgit v1.2.3