diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2017-03-31 11:50:07 +0200 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2017-03-31 16:45:12 +0200 |
commit | ed10ef0208f794060b5351cc601a915177e0a1c5 (patch) | |
tree | ff68342c68381cbb693995f3043d03a7d7546229 /compiler/test/dotty/tools/dotc/ParallelTesting.scala | |
parent | 57a11776480ab5259281dd29777c45af9ea3ca78 (diff) | |
download | dotty-ed10ef0208f794060b5351cc601a915177e0a1c5.tar.gz dotty-ed10ef0208f794060b5351cc601a915177e0a1c5.tar.bz2 dotty-ed10ef0208f794060b5351cc601a915177e0a1c5.zip |
Fix deadlock in `runAll`
Diffstat (limited to 'compiler/test/dotty/tools/dotc/ParallelTesting.scala')
-rw-r--r-- | compiler/test/dotty/tools/dotc/ParallelTesting.scala | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/compiler/test/dotty/tools/dotc/ParallelTesting.scala b/compiler/test/dotty/tools/dotc/ParallelTesting.scala index 990a856ca..c1da7807b 100644 --- a/compiler/test/dotty/tools/dotc/ParallelTesting.scala +++ b/compiler/test/dotty/tools/dotc/ParallelTesting.scala @@ -174,6 +174,8 @@ trait ParallelTesting { self => * according to the implementing class "neg", "run" or "pos". */ private abstract class Test(testSources: List[TestSource], times: Int, threadLimit: Option[Int], suppressAllOutput: Boolean) { + protected final val realStdout = System.out + protected final val realStderr = System.err /** Actual compilation run logic, the test behaviour is defined here */ protected def compilationRunnable(testSource: TestSource): Runnable @@ -192,10 +194,10 @@ trait ParallelTesting { self => val sourceCount = filteredSources.length private[this] var _errorCount = 0 - def errorCount: Int = synchronized { _errorCount } + def errorCount: Int = _errorCount private[this] var _testSourcesCompiled = 0 - private def testSourcesCompiled : Int = synchronized { _testSourcesCompiled } + private def testSourcesCompiled: Int = _testSourcesCompiled /** Complete the current compilation with the amount of errors encountered */ protected final def registerCompilation(errors: Int) = synchronized { @@ -228,7 +230,7 @@ trait ParallelTesting { self => /** Prints to `System.err` if we're not suppressing all output */ protected def echo(msg: String): Unit = - if (!suppressAllOutput) System.err.println(msg) + if (!suppressAllOutput) realStderr.println(msg) /** A single `Runnable` that prints a progress bar for the curent `Test` */ private def createProgressMonitor: Runnable = new Runnable { @@ -238,17 +240,19 @@ trait ParallelTesting { self => while (tCompiled < sourceCount) { val timestamp = (System.currentTimeMillis - start) / 1000 val progress = (tCompiled.toDouble / sourceCount * 40).toInt - print( + + realStdout.print( "[" + ("=" * (math.max(progress - 1, 0))) + (if (progress > 0) ">" else "") + (" " * (39 - progress)) + s"] compiling ($tCompiled/$sourceCount, ${timestamp}s)\r" ) + Thread.sleep(100) tCompiled = testSourcesCompiled } // println, otherwise no newline and cursor at start of line - println( + realStdout.println( s"[=======================================] compiled ($sourceCount/$sourceCount, " + s"${(System.currentTimeMillis - start) / 1000}s) " ) @@ -259,7 +263,10 @@ trait ParallelTesting { self => * if it did, the test should automatically fail. */ protected def tryCompile(testSource: TestSource)(op: => Unit): Unit = - try op catch { + try { + if (!isInteractive) realStdout.println(s"Testing ${testSource.title}") + op + } catch { case NonFatal(e) => { // if an exception is thrown during compilation, the complete test // run should fail @@ -309,8 +316,10 @@ trait ParallelTesting { self => Runtime.getRuntime.exec(fullArgs).waitFor() == 0 } else true - val reporter = TestReporter.parallelReporter(this, logLevel = - if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR) + val reporter = + TestReporter.reporter(realStdout, logLevel = + if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR) + val driver = if (times == 1) new Driver { def newCompiler(implicit ctx: Context) = new Compiler } else new Driver { @@ -353,8 +362,12 @@ trait ParallelTesting { self => } pool.shutdown() - if (!pool.awaitTermination(10, TimeUnit.MINUTES)) + if (!pool.awaitTermination(20, TimeUnit.MINUTES)) { + pool.shutdownNow() + System.setOut(realStdout) + System.setErr(realStderr) throw new TimeoutException("Compiling targets timed out") + } if (didFail) { reportFailed() @@ -417,8 +430,6 @@ trait ParallelTesting { self => import java.net.{ URL, URLClassLoader } val printStream = new ByteArrayOutputStream - val oldOut = System.out - val oldErr = System.err try { // Do classloading magic and running here: @@ -426,7 +437,7 @@ trait ParallelTesting { self => val cls = ucl.loadClass("Test") val meth = cls.getMethod("main", classOf[Array[String]]) - self.synchronized { + synchronized { try { val ps = new PrintStream(printStream) System.setOut(ps) @@ -436,9 +447,13 @@ trait ParallelTesting { self => meth.invoke(null, Array("jvm")) // partest passes at least "jvm" as an arg } } - } finally { - System.setOut(oldOut) - System.setErr(oldErr) + System.setOut(realStdout) + System.setErr(realStderr) + } catch { + case t: Throwable => + System.setOut(realStdout) + System.setErr(realStderr) + throw t } } } |