Skip to content

Commit 52217a5

Browse files
committed
Disable parallel compilation
The code related to thread poool crashes the container. Running it on Windows has no problem. It seems to be a bug with JDK/JVM.
1 parent 3d0c25d commit 52217a5

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Diff for: compiler/test/dotty/tools/dotc/FromTastyTests.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class FromTastyTests extends ParallelTesting {
2222
def testFilter = Properties.testsFilter
2323
def updateCheckFiles: Boolean = Properties.testsUpdateCheckfile
2424

25-
@Test def posTestFromTasty: Unit = if (!scala.util.Properties.isWin) {
25+
@Test def posTestFromTasty: Unit = {
2626
// Can be reproduced with
2727
// > sbt
2828
// > dotc -Ythrough-tasty -Ycheck:all <source>
@@ -33,7 +33,7 @@ class FromTastyTests extends ParallelTesting {
3333
).checkCompile()
3434
}
3535

36-
@Test def runTestFromTasty: Unit = if (!scala.util.Properties.isWin) {
36+
@Test def runTestFromTasty: Unit = {
3737
// Can be reproduced with
3838
// > sbt
3939
// > dotc -Ythrough-tasty -Ycheck:all <source>

Diff for: compiler/test/dotty/tools/vulpix/ParallelTesting.scala

+14-14
Original file line numberDiff line numberDiff line change
@@ -541,26 +541,26 @@ trait ParallelTesting extends RunnerOrchestration { self =>
541541
}
542542

543543
val eventualResults = filteredSources.map { target =>
544-
pool.submit(encapsulatedCompilation(target))
544+
encapsulatedCompilation(target)
545545
}
546546

547-
pool.shutdown()
547+
// pool.shutdown()
548548

549-
if (!pool.awaitTermination(20, TimeUnit.MINUTES)) {
550-
val remaining = new ListBuffer[TestSource]
551-
filteredSources.lazyZip(eventualResults).foreach { (src, res) =>
552-
if (!res.isDone)
553-
remaining += src
554-
}
549+
// if (!pool.awaitTermination(20, TimeUnit.MINUTES)) {
550+
// val remaining = new ListBuffer[TestSource]
551+
// filteredSources.lazyZip(eventualResults).foreach { (src, res) =>
552+
// if (!res.isDone)
553+
// remaining += src
554+
// }
555555

556-
pool.shutdownNow()
557-
System.setOut(realStdout)
558-
System.setErr(realStderr)
559-
throw new TimeoutException(s"Compiling targets timed out, remaining targets: ${remaining.mkString(", ")}")
560-
}
556+
// pool.shutdownNow()
557+
// System.setOut(realStdout)
558+
// System.setErr(realStderr)
559+
// throw new TimeoutException(s"Compiling targets timed out, remaining targets: ${remaining.mkString(", ")}")
560+
// }
561561

562562
eventualResults.foreach { x =>
563-
try x.get()
563+
try x.run()
564564
catch {
565565
case ex: Exception =>
566566
System.err.println(ex.getMessage)

0 commit comments

Comments
 (0)