diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2017-04-04 16:43:51 +0200 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2017-04-12 11:21:57 +0200 |
commit | a3078ee21bab6da72fa0077fe140173785e17c6a (patch) | |
tree | 0cbac9ee8512b581f4acac09efdc012a8efc2ed2 /compiler/test/dotty/tools | |
parent | 429066b6dacdd7670d1fce4b445d7bedc93df14d (diff) | |
download | dotty-a3078ee21bab6da72fa0077fe140173785e17c6a.tar.gz dotty-a3078ee21bab6da72fa0077fe140173785e17c6a.tar.bz2 dotty-a3078ee21bab6da72fa0077fe140173785e17c6a.zip |
Fix settings having uninitialized values
Diffstat (limited to 'compiler/test/dotty/tools')
3 files changed, 15 insertions, 8 deletions
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 ------------------------------------------------------------ diff --git a/compiler/test/dotty/tools/dotc/vulpix/RunnerOrchestration.scala b/compiler/test/dotty/tools/dotc/vulpix/RunnerOrchestration.scala index 8a5d16b83..a7da752bb 100644 --- a/compiler/test/dotty/tools/dotc/vulpix/RunnerOrchestration.scala +++ b/compiler/test/dotty/tools/dotc/vulpix/RunnerOrchestration.scala @@ -1,6 +1,4 @@ -package dotty -package tools -package dotc +package dotty.tools.dotc package vulpix import java.io.{ @@ -18,15 +16,15 @@ import scala.collection.mutable trait RunnerOrchestration { /** The maximum amount of active runners, which contain a child JVM */ - val numberOfSlaves: Int + def numberOfSlaves: Int /** The maximum duration the child process is allowed to consume before * getting destroyed */ - val maxDuration: Duration + def maxDuration: Duration /** Destroy and respawn process after each test */ - val safeMode: Boolean + def safeMode: Boolean /** Running a `Test` class's main method from the specified `dir` */ def runMain(dir: JFile): Status = monitor.runMain(dir) diff --git a/compiler/test/dotty/tools/dotc/vulpix/VulpixTests.scala b/compiler/test/dotty/tools/dotc/vulpix/VulpixTests.scala index dea5aa777..1a1775995 100644 --- a/compiler/test/dotty/tools/dotc/vulpix/VulpixTests.scala +++ b/compiler/test/dotty/tools/dotc/vulpix/VulpixTests.scala @@ -6,11 +6,15 @@ package vulpix import org.junit.Assert._ import org.junit.Test +import scala.concurrent.duration._ import scala.util.control.NonFatal class VulpixTests extends ParallelTesting { import CompilationTests._ + def maxDuration = 3.seconds + def numberOfSlaves = 5 + def safeMode = sys.env.get("SAFEMODE").isDefined def isInteractive = !sys.env.contains("DRONE") def testFilter = None |