File tree Expand file tree Collapse file tree 4 files changed +20
-8
lines changed Expand file tree Collapse file tree 4 files changed +20
-8
lines changed Original file line number Diff line number Diff line change @@ -2,8 +2,13 @@ package dotc
2
2
3
3
import dotty .tools .dotc .vulpix .ParallelTesting
4
4
5
+ import scala .concurrent .duration ._
6
+
5
7
object comptest extends ParallelTesting {
6
8
9
+ def maxDuration = 3 .seconds
10
+ def numberOfSlaves = 5
11
+ def safeMode = false
7
12
def isInteractive = true
8
13
def testFilter = None
9
14
Original file line number Diff line number Diff line change @@ -6,15 +6,20 @@ import org.junit.Test
6
6
import org .junit .experimental .categories .Category
7
7
8
8
import scala .util .matching .Regex
9
+ import scala .concurrent .duration ._
9
10
import vulpix .{ ParallelTesting , SummaryReport }
10
11
11
12
@ Category (Array (classOf [ParallelTesting ]))
12
13
class CompilationTests extends SummaryReport with ParallelTesting {
13
14
import CompilationTests ._
14
15
15
- def isInteractive : Boolean = SummaryReport .isInteractive
16
+ // Test suite configuration --------------------------------------------------
16
17
17
- def testFilter : Option [Regex ] = sys.props.get(" dotty.partest.filter" ).map(r => new Regex (r))
18
+ def maxDuration = 3 .seconds
19
+ def numberOfSlaves = 5
20
+ def safeMode = sys.env.get(" SAFEMODE" ).isDefined
21
+ def isInteractive = SummaryReport .isInteractive
22
+ def testFilter = sys.props.get(" dotty.partest.filter" ).map(r => new Regex (r))
18
23
19
24
// Positive tests ------------------------------------------------------------
20
25
Original file line number Diff line number Diff line change 1
- package dotty
2
- package tools
3
- package dotc
1
+ package dotty .tools .dotc
4
2
package vulpix
5
3
6
4
import java .io .{
@@ -18,15 +16,15 @@ import scala.collection.mutable
18
16
trait RunnerOrchestration {
19
17
20
18
/** The maximum amount of active runners, which contain a child JVM */
21
- val numberOfSlaves : Int
19
+ def numberOfSlaves : Int
22
20
23
21
/** The maximum duration the child process is allowed to consume before
24
22
* getting destroyed
25
23
*/
26
- val maxDuration : Duration
24
+ def maxDuration : Duration
27
25
28
26
/** Destroy and respawn process after each test */
29
- val safeMode : Boolean
27
+ def safeMode : Boolean
30
28
31
29
/** Running a `Test` class's main method from the specified `dir` */
32
30
def runMain (dir : JFile ): Status = monitor.runMain(dir)
Original file line number Diff line number Diff line change @@ -6,11 +6,15 @@ package vulpix
6
6
import org .junit .Assert ._
7
7
import org .junit .Test
8
8
9
+ import scala .concurrent .duration ._
9
10
import scala .util .control .NonFatal
10
11
11
12
class VulpixTests extends ParallelTesting {
12
13
import CompilationTests ._
13
14
15
+ def maxDuration = 3 .seconds
16
+ def numberOfSlaves = 5
17
+ def safeMode = sys.env.get(" SAFEMODE" ).isDefined
14
18
def isInteractive = ! sys.env.contains(" DRONE" )
15
19
def testFilter = None
16
20
You can’t perform that action at this time.
0 commit comments