From a3078ee21bab6da72fa0077fe140173785e17c6a Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 4 Apr 2017 16:43:51 +0200 Subject: Fix settings having uninitialized values --- compiler/test/dotty/tools/dotc/CompilationTests.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'compiler/test/dotty/tools/dotc/CompilationTests.scala') diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index a2d632b19..241714f8b 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -6,15 +6,20 @@ import org.junit.Test import org.junit.experimental.categories.Category import scala.util.matching.Regex +import scala.concurrent.duration._ import vulpix.{ ParallelTesting, SummaryReport } @Category(Array(classOf[ParallelTesting])) class CompilationTests extends SummaryReport with ParallelTesting { import CompilationTests._ - def isInteractive: Boolean = SummaryReport.isInteractive + // Test suite configuration -------------------------------------------------- - def testFilter: Option[Regex] = sys.props.get("dotty.partest.filter").map(r => new Regex(r)) + def maxDuration = 3.seconds + def numberOfSlaves = 5 + def safeMode = sys.env.get("SAFEMODE").isDefined + def isInteractive = SummaryReport.isInteractive + def testFilter = sys.props.get("dotty.partest.filter").map(r => new Regex(r)) // Positive tests ------------------------------------------------------------ -- cgit v1.2.3