Skip to content

Commit 081d928

Browse files
committed
Add vulpix docstrings and change defines
1 parent 0a7e7f6 commit 081d928

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

compiler/test/dotty/tools/dotc/CompilationTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ class CompilationTests extends SummaryReport with ParallelTesting {
1616

1717
def maxDuration = 180.seconds
1818
def numberOfSlaves = 5
19-
def safeMode = sys.env.get("SAFEMODE").isDefined
19+
def safeMode = sys.env.get("dotty.tests.safemode").isDefined
2020
def isInteractive = SummaryReport.isInteractive
21-
def testFilter = sys.props.get("dotty.partest.filter").map(r => new Regex(r))
21+
def testFilter = sys.props.get("dotty.tests.filter").map(r => new Regex(r))
2222

2323
// Positive tests ------------------------------------------------------------
2424

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,14 @@ trait RunnerOrchestration {
4747

4848
private[this] val monitor = new RunnerMonitor
4949

50-
/** Look away now, sweet child of summer */
50+
/** The runner monitor object keeps track of child JVM processes by keeping
51+
* them in two structures - one for free, and one for busy children.
52+
*
53+
* When a user calls `runMain` the monitor makes takes a free JVM and blocks
54+
* until the run is complete - or `maxDuration` has passed. It then performs
55+
* cleanup by returning the used JVM to the free list, or respawning it if
56+
* it died
57+
*/
5158
private class RunnerMonitor {
5259

5360
def runMain(classPath: String): Status = withRunner(_.runMain(classPath))
@@ -128,6 +135,9 @@ trait RunnerOrchestration {
128135
}
129136
}
130137

138+
/** Create a process which has the classpath of the `ChildJVMMain` and the
139+
* scala library.
140+
*/
131141
private def createProcess: Process = {
132142
val sep = sys.props("file.separator")
133143
val cp =
@@ -142,7 +152,6 @@ trait RunnerOrchestration {
142152
}
143153

144154
private[this] val allRunners = List.fill(numberOfSlaves)(new Runner(createProcess))
145-
146155
private[this] val freeRunners = mutable.Queue(allRunners: _*)
147156
private[this] val busyRunners = mutable.Set.empty[Runner]
148157

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import org.junit.Test
77
import scala.concurrent.duration._
88
import scala.util.control.NonFatal
99

10+
/** Meta tests for the Vulpix test suite */
1011
class VulpixTests extends ParallelTesting {
1112
import dotc.CompilationTests._
1213

0 commit comments

Comments
 (0)