Skip to content

Commit 93d888d

Browse files
committed
Increase the timeout a bit for the Windows CI.
1 parent aae33ce commit 93d888d

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ trait ParallelTesting extends RunnerOrchestration { self =>
5757
/** Tests should override the checkfiles with the current output */
5858
def updateCheckFiles: Boolean
5959

60+
def testSuiteTimeoutInMinutes: Int = 20
61+
6062
/** A test source whose files or directory of files is to be compiled
6163
* in a specific way defined by the `Test`
6264
*/
@@ -654,7 +656,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
654656

655657
pool.shutdown()
656658

657-
if (!pool.awaitTermination(20, TimeUnit.MINUTES)) {
659+
if (!pool.awaitTermination(testSuiteTimeoutInMinutes, TimeUnit.MINUTES)) {
658660
val remaining = new ListBuffer[TestSource]
659661
filteredSources.lazyZip(eventualResults).foreach { (src, res) =>
660662
if (!res.isDone)

sjs-compiler-tests/test/scala/dotty/tools/dotc/ScalaJSCompilationTests.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class ScalaJSCompilationTests extends ParallelTesting {
2424
def testFilter = Properties.testsFilter
2525
def updateCheckFiles: Boolean = Properties.testsUpdateCheckfile
2626

27+
override def testSuiteTimeoutInMinutes = 30 // for the Windows CI
28+
2729
// Negative tests ------------------------------------------------------------
2830

2931
@Test def negScalaJS: Unit = {

0 commit comments

Comments
 (0)