1 files changed, 6 insertions, 7 deletions
diff --git a/test/files/run/toolbox_console_reporter.scala b/test/files/run/toolbox_console_reporter.scala
index d672ccb9cb..ce28086c25 100644
--- a/test/files/run/toolbox_console_reporter.scala
+++ b/test/files/run/toolbox_console_reporter.scala
@@ -4,10 +4,10 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, mkConsoleFrontEnd}
 
 object Test extends App {
-  val oldErr = Console.err;
-  val baos = new java.io.ByteArrayOutputStream();
-  Console.setErr(new java.io.PrintStream(baos));
-  try {
+  //val oldErr = Console.err;
+  val baos = new java.io.ByteArrayOutputStream()
+  val errs = new java.io.PrintStream(baos)
+  (Console withErr errs) {
     val toolbox = cm.mkToolBox(frontEnd = mkConsoleFrontEnd(), options = "-deprecation")
     toolbox.eval(reify{
       object Utils {
@@ -18,12 +18,11 @@ object Test extends App {
       Utils.foo
     }.tree)
     println("============compiler console=============")
+    errs.flush()
     println(baos.toString);
     println("=========================================")
     println("============compiler messages============")
     toolbox.frontEnd.infos.foreach(println(_))
     println("=========================================")
-  } finally {
-    Console.setErr(oldErr);
   }
-}
-\ No newline at end of file
+}