From 9307d0735c619fcc3c654156a252526e7d2931fa Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 1 Jan 2018 09:11:13 -0800 Subject: Silence IntegrationTest stdout --- core/src/main/scala/mill/Main.scala | 5 ++++- core/src/main/scala/mill/main/MainRunner.scala | 14 +++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'core/src') diff --git a/core/src/main/scala/mill/Main.scala b/core/src/main/scala/mill/Main.scala index 9d0c328f..c2439f29 100644 --- a/core/src/main/scala/mill/Main.scala +++ b/core/src/main/scala/mill/Main.scala @@ -52,7 +52,10 @@ object Main { welcomeBanner = None ) - val runner = new mill.main.MainRunner(config, show) + val runner = new mill.main.MainRunner( + config, show, + System.out, System.err, System.in, System.out, System.err + ) if (repl){ runner.printInfo("Loading...") runner.runRepl() diff --git a/core/src/main/scala/mill/main/MainRunner.scala b/core/src/main/scala/mill/main/MainRunner.scala index 869975bc..93016453 100644 --- a/core/src/main/scala/mill/main/MainRunner.scala +++ b/core/src/main/scala/mill/main/MainRunner.scala @@ -1,4 +1,6 @@ package mill.main +import java.io.{InputStream, OutputStream, PrintStream} + import ammonite.interp.{Interpreter, Preprocessor} import ammonite.ops.Path import ammonite.util.{Imports, Name, Res, Util} @@ -11,11 +13,13 @@ import upickle.Js * `build.sc` scripts with mill-specific tweaks such as a custom * `scriptCodeWrapper` or with a persistent evaluator between runs. */ -class MainRunner(config: ammonite.main.Cli.Config, show: Boolean) - extends ammonite.MainRunner( - config, - System.out, System.err, System.in, System.out, System.err - ){ +class MainRunner(config: ammonite.main.Cli.Config, show: Boolean, + outprintStream: PrintStream, + errPrintStream: PrintStream, + stdIn: InputStream, + stdOut: OutputStream, + stdErr: OutputStream) + extends ammonite.MainRunner(config, outprintStream, errPrintStream, stdIn, stdOut, stdErr){ var lastEvaluator: Option[(Seq[(Path, Long)], Evaluator[_])] = None override def runScript(scriptPath: Path, scriptArgs: List[String]) = watchLoop( -- cgit v1.2.3