aboutsummaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2017-04-13 19:21:08 +0200
committerGitHub <noreply@github.com>2017-04-13 19:21:08 +0200
commit975f7efab69e8e5a23db665f33dceecb0bf6ceaa (patch)
treeda35c6ff938655ab93c791980ef98d4ae8cb4cca /compiler
parent889ed89312cbe70040df92e84432853d38906308 (diff)
parent623a1d43155823cc7506c3223405bb68f459fd50 (diff)
downloaddotty-975f7efab69e8e5a23db665f33dceecb0bf6ceaa.tar.gz
dotty-975f7efab69e8e5a23db665f33dceecb0bf6ceaa.tar.bz2
dotty-975f7efab69e8e5a23db665f33dceecb0bf6ceaa.zip
Merge pull request #2251 from dotty-staging/fix-#2220
Fix #2220: disable benchmarks, set run timeout to 30 seconds
Diffstat (limited to 'compiler')
-rw-r--r--compiler/test/dotty/tools/dotc/CompilationTests.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index cf9b200d4..a5914bf4d 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -15,7 +15,7 @@ class CompilationTests extends ParallelTesting {
// Test suite configuration --------------------------------------------------
- def maxDuration = 180.seconds
+ def maxDuration = 30.seconds
def numberOfSlaves = 5
def safeMode = Properties.testsSafeMode
def isInteractive = SummaryReport.isInteractive