File tree 3 files changed +14
-4
lines changed
compiler/test/dotty/tools 3 files changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -16,9 +16,9 @@ class CompilationTests extends SummaryReport with ParallelTesting {
16
16
17
17
def maxDuration = 180 .seconds
18
18
def numberOfSlaves = 5
19
- def safeMode = sys.env.get(" SAFEMODE " ).isDefined
19
+ def safeMode = sys.env.get(" dotty.tests.safemode " ).isDefined
20
20
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))
22
22
23
23
// Positive tests ------------------------------------------------------------
24
24
Original file line number Diff line number Diff line change @@ -47,7 +47,14 @@ trait RunnerOrchestration {
47
47
48
48
private [this ] val monitor = new RunnerMonitor
49
49
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
+ */
51
58
private class RunnerMonitor {
52
59
53
60
def runMain (classPath : String ): Status = withRunner(_.runMain(classPath))
@@ -128,6 +135,9 @@ trait RunnerOrchestration {
128
135
}
129
136
}
130
137
138
+ /** Create a process which has the classpath of the `ChildJVMMain` and the
139
+ * scala library.
140
+ */
131
141
private def createProcess : Process = {
132
142
val sep = sys.props(" file.separator" )
133
143
val cp =
@@ -142,7 +152,6 @@ trait RunnerOrchestration {
142
152
}
143
153
144
154
private [this ] val allRunners = List .fill(numberOfSlaves)(new Runner (createProcess))
145
-
146
155
private [this ] val freeRunners = mutable.Queue (allRunners : _* )
147
156
private [this ] val busyRunners = mutable.Set .empty[Runner ]
148
157
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ import org.junit.Test
7
7
import scala .concurrent .duration ._
8
8
import scala .util .control .NonFatal
9
9
10
+ /** Meta tests for the Vulpix test suite */
10
11
class VulpixTests extends ParallelTesting {
11
12
import dotc .CompilationTests ._
12
13
You can’t perform that action at this time.
0 commit comments