diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index 47ed2aa6564d..185b9ccb4b30 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -333,7 +333,7 @@ class CompilationTests { object CompilationTests extends ParallelTesting { // Test suite configuration -------------------------------------------------- - def maxDuration = 45.seconds + def maxDuration = 100.seconds def numberOfSlaves = Runtime.getRuntime().availableProcessors() def safeMode = Properties.testsSafeMode def isInteractive = SummaryReport.isInteractive diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 12a53a19931d..266c5d717a7b 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -292,6 +292,7 @@ trait ParallelTesting extends RunnerOrchestration { self => /** Entry point: runs the test */ final def encapsulatedCompilation(testSource: TestSource) = new LoggedRunnable { self => def checkTestSource(): Unit = tryCompile(testSource) { + registerStart val reportersOrCrash = compileTestSource(testSource) onComplete(testSource, reportersOrCrash, self) registerCompletion() @@ -395,9 +396,14 @@ trait ParallelTesting extends RunnerOrchestration { self => /** Total amount of test sources being compiled by this test */ val sourceCount = filteredSources.length + private var testSourcesStarted = 0 + private var _testSourcesCompleted = 0 private def testSourcesCompleted: Int = _testSourcesCompleted + protected final def registerStart = synchronized: + testSourcesStarted += 1 + /** Complete the current compilation with the amount of errors encountered */ protected final def registerCompletion() = synchronized { _testSourcesCompleted += 1 @@ -473,7 +479,7 @@ trait ParallelTesting extends RunnerOrchestration { self => val past = "=" * math.max(progress - 1, 0) val curr = if progress > 0 then ">" else "" val next = " " * (40 - progress) - s"[$past$curr$next] completed ($tCompiled/$sourceCount, $failureCount failed, ${timestamp}s)" + s"[$past$curr$next] completed ($tCompiled/$sourceCount, ${testSourcesStarted} started, $failureCount failed, ${timestamp}s)" /** Wrapper function to make sure that the compiler itself did not crash - * if it did, the test should automatically fail. diff --git a/compiler/test/dotty/tools/vulpix/SummaryReport.scala b/compiler/test/dotty/tools/vulpix/SummaryReport.scala index 77bfdc063d08..b91895b96ac0 100644 --- a/compiler/test/dotty/tools/vulpix/SummaryReport.scala +++ b/compiler/test/dotty/tools/vulpix/SummaryReport.scala @@ -138,5 +138,5 @@ final class SummaryReport extends SummaryReporting { } object SummaryReport { - val isInteractive = Properties.testsInteractive && !Properties.isRunByCI + val isInteractive = true //Properties.testsInteractive && !Properties.isRunByCI }