Merge pull request #2148 from dotty-staging/topic/fix-#2147

Fix #2147: redirect both java and scala std out/err

Author: nicolasstucki

compiler/foo

@@ -52,4 +52,7 @@ class ParallelTestTests extends ParallelTesting {
 
   @Test def runStackOverflow: Unit =
     compileFile("../tests/partest-test/stackOverflow.scala", defaultOptions).expectFailure.checkRuns()
+
+  @Test def runOutRedirects: Unit =
+    compileFile("../tests/partest-test/i2147.scala", defaultOptions).expectFailure.checkRuns()
 }

compiler/test/dotty/tools/dotc/ParallelTestTests.scala

@@ -28,7 +28,7 @@ import dotc.util.DiffUtil
  *  using this, you should be running your JUnit tests **sequentially**, as the
  *  test suite itself runs with a high level of concurrency.
  */
-trait ParallelTesting {
+trait ParallelTesting { self =>
 
   import ParallelTesting._
   import ParallelSummaryReport._
@@ -399,18 +399,33 @@ trait ParallelTesting {
           .takeWhile(_.getMethodName != "invoke0")
           .mkString("    ", "\n    ", "")
 
-      import java.io.ByteArrayOutputStream
+      import java.io.{ ByteArrayOutputStream, PrintStream }
       import java.net.{ URL, URLClassLoader }
 
       val printStream = new ByteArrayOutputStream
+      val oldOut = System.out
+      val oldErr = System.out
+
       try {
         // Do classloading magic and running here:
         val ucl = new URLClassLoader(Array(dir.toURI.toURL))
         val cls = ucl.loadClass("Test")
         val meth = cls.getMethod("main", classOf[Array[String]])
 
-        Console.withOut(printStream) {
-          meth.invoke(null, Array("jvm")) // partest passes at least "jvm" as an arg
+        self.synchronized {
+          try {
+            val ps = new PrintStream(printStream)
+            System.setOut(ps)
+            System.setErr(ps)
+            Console.withOut(printStream) {
+              Console.withErr(printStream) {
+                meth.invoke(null, Array("jvm")) // partest passes at least "jvm" as an arg
+              }
+            }
+          } finally {
+            System.setOut(oldOut)
+            System.setErr(oldErr)
+          }
         }
       }
       catch {

compiler/test/dotty/tools/dotc/ParallelTesting.scala

@@ -0,0 +1,3 @@
+Felix is number 1
+ducksarethebest.org
+foolsRus.org

tests/partest-test/i2147.check

@@ -0,0 +1,7 @@
+object Test {
+  def main(args: Array[String]): Unit = {
+    println("Guillaume is number 1")
+    System.out.println("ducksarethebest.com")
+    System.err.println("foolsRus.com")
+  }
+}

tests/partest-test/i2147.scala

@@ -0,0 +1,3 @@
+before
+42
+lol

tests/run/i2147.check

@@ -0,0 +1,7 @@
+object Test {
+  def main(args: Array[String]): Unit = {
+    println("before")
+    System.out.println("42")
+    println("lol")
+  }
+}