DPDirectCompiler: Set output using System.setOut/setErr

Author: smarter

test/dotty/partest/DPDirectCompiler.scala

@@ -2,16 +2,15 @@ package dotty.partest
 
 import dotty.tools.dotc.reporting.ConsoleReporter
 import scala.tools.partest.{ TestState, nest }
-import java.io.{ File, PrintWriter, FileWriter }
+import java.io._
 
 
 /* NOTE: Adapted from partest.DirectCompiler and DottyTest */
 class DPDirectCompiler(runner: DPTestRunner) extends nest.DirectCompiler(runner) {
 
   override def compile(opts0: List[String], sources: List[File]): TestState = {
-    val clogFWriter = new FileWriter(runner.cLogFile.jfile, true)
-    val clogWriter = new PrintWriter(clogFWriter, true)
-    clogWriter.println("\ncompiling " + sources.mkString(" ") + "\noptions: " + opts0.mkString(" "))
+    val clogStream = new PrintStream(new FileOutputStream(runner.cLogFile.jfile), true)
+    clogStream.println("\ncompiling " + sources.mkString(" ") + "\noptions: " + opts0.mkString(" "))
 
     implicit val ctx: dotty.tools.dotc.core.Contexts.Context = {
       val base = new dotty.tools.dotc.core.Contexts.ContextBase
@@ -22,12 +21,16 @@ class DPDirectCompiler(runner: DPTestRunner) extends nest.DirectCompiler(runner)
       ctx
     }
 
+    val savedOut = System.out
+    val savedErr = System.err
     try {
       val processor =
         if (opts0.exists(_.startsWith("#"))) dotty.tools.dotc.Bench else dotty.tools.dotc.Main
-      val clogger = new ConsoleReporter(writer = clogWriter)(ctx)
-      val logCtx = ctx.fresh.setTyperState(ctx.typerState.withReporter(clogger))
-      val reporter = processor.process((sources.map(_.toString) ::: opts0).toArray, logCtx)
+
+      System.setOut(clogStream)
+      System.setErr(clogStream)
+
+      val reporter = processor.process((sources.map(_.toString) ::: opts0).toArray)
       if (!reporter.hasErrors) runner.genPass()
       else {
         reporter.printSummary(ctx)
@@ -36,8 +39,9 @@ class DPDirectCompiler(runner: DPTestRunner) extends nest.DirectCompiler(runner)
     } catch {
       case t: Throwable => runner.genCrash(t)
     } finally {
-      clogFWriter.close
-      clogWriter.close
+      System.setOut(savedOut)
+      System.setErr(savedErr)
+      clogStream.close
     }
   }
 }