Merge pull request #3169 from esarbe/2966

allanrenucci · web-flow · commit 3ed8f8ef136a · 2017-10-09T16:15:59.000+02:00
Fixing #2966
diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -411,7 +411,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
         if (isInteractive && !suppressAllOutput) pool.submit(createProgressMonitor)
 
-        filteredSources.foreach { target =>
+        val eventualResults = filteredSources.map { target =>
           pool.submit(encapsulatedCompilation(target))
         }
 
@@ -423,6 +423,8 @@ trait ParallelTesting extends RunnerOrchestration { self =>
           throw new TimeoutException("Compiling targets timed out")
         }
 
+        eventualResults.foreach(_.get)
+
         if (didFail) {
           reportFailed()
           failedTestSources.toSet.foreach(addFailedTest)

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>`
`411`	`411`
`412`	`412`	`if (isInteractive && !suppressAllOutput) pool.submit(createProgressMonitor)`
`413`	`413`
`414`		`- filteredSources.foreach { target =>`
	`414`	`+ val eventualResults = filteredSources.map { target =>`
`415`	`415`	`pool.submit(encapsulatedCompilation(target))`
`416`	`416`	`}`
`417`	`417`
`@@ -423,6 +423,8 @@ trait ParallelTesting extends RunnerOrchestration { self =>`
`423`	`423`	`throw new TimeoutException("Compiling targets timed out")`
`424`	`424`	`}`
`425`	`425`
	`426`	`+ eventualResults.foreach(_.get)`
	`427`	`+`
`426`	`428`	`if (didFail) {`
`427`	`429`	`reportFailed()`
`428`	`430`	`failedTestSources.toSet.foreach(addFailedTest)`