aboutsummaryrefslogtreecommitdiff
path: root/compiler/test/dotty/tools/dotc/ParallelTestTests.scala
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/test/dotty/tools/dotc/ParallelTestTests.scala')
-rw-r--r--compiler/test/dotty/tools/dotc/ParallelTestTests.scala26
1 files changed, 12 insertions, 14 deletions
diff --git a/compiler/test/dotty/tools/dotc/ParallelTestTests.scala b/compiler/test/dotty/tools/dotc/ParallelTestTests.scala
index a22df0ace..30ec88455 100644
--- a/compiler/test/dotty/tools/dotc/ParallelTestTests.scala
+++ b/compiler/test/dotty/tools/dotc/ParallelTestTests.scala
@@ -10,13 +10,12 @@ import scala.util.control.NonFatal
class ParallelTestTests extends ParallelTesting {
import CompilationTests._
- def interactive: Boolean = !sys.env.contains("DRONE")
-
- def regex: Option[String] = None
+ def isInteractive = !sys.env.contains("DRONE")
+ def testFilter = None
@Test def missingFile: Unit =
try {
- compileFile("../tests/partest-test/i-dont-exist.scala", defaultOptions).expectFailure.neg()
+ compileFile("../tests/partest-test/i-dont-exist.scala", defaultOptions).expectFailure.checkExpectedErrors()
fail("didn't fail properly")
}
catch {
@@ -25,29 +24,28 @@ class ParallelTestTests extends ParallelTesting {
}
@Test def pos1Error: Unit =
- compileFile("../tests/partest-test/posFail1Error.scala", defaultOptions).expectFailure.pos()
+ compileFile("../tests/partest-test/posFail1Error.scala", defaultOptions).expectFailure.checkCompile()
- @Test def negMissingAnnot: Unit =
- compileFile("../tests/partest-test/negMissingAnnot.scala", defaultOptions).expectFailure.neg()
+ @Test def negMissingAnnot: Unit = compileFile("../tests/partest-test/negMissingAnnot.scala", defaultOptions).expectFailure.checkExpectedErrors()
@Test def negAnnotWrongLine: Unit =
- compileFile("../tests/partest-test/negAnnotWrongLine.scala", defaultOptions).expectFailure.neg()
+ compileFile("../tests/partest-test/negAnnotWrongLine.scala", defaultOptions).expectFailure.checkExpectedErrors()
@Test def negTooManyAnnots: Unit =
- compileFile("../tests/partest-test/negTooManyAnnots.scala", defaultOptions).expectFailure.neg()
+ compileFile("../tests/partest-test/negTooManyAnnots.scala", defaultOptions).expectFailure.checkExpectedErrors()
@Test def negNoPositionAnnot: Unit =
- compileFile("../tests/partest-test/negNoPositionAnnots.scala", defaultOptions).expectFailure.neg()
+ compileFile("../tests/partest-test/negNoPositionAnnots.scala", defaultOptions).expectFailure.checkExpectedErrors()
@Test def runCompileFail: Unit =
- compileFile("../tests/partest-test/posFail1Error.scala", defaultOptions).expectFailure.run()
+ compileFile("../tests/partest-test/posFail1Error.scala", defaultOptions).expectFailure.checkRuns()
@Test def runWrongOutput1: Unit =
- compileFile("../tests/partest-test/runWrongOutput1.scala", defaultOptions).expectFailure.run()
+ compileFile("../tests/partest-test/runWrongOutput1.scala", defaultOptions).expectFailure.checkRuns()
@Test def runWrongOutput2: Unit =
- compileFile("../tests/partest-test/runWrongOutput2.scala", defaultOptions).expectFailure.run()
+ compileFile("../tests/partest-test/runWrongOutput2.scala", defaultOptions).expectFailure.checkRuns()
@Test def runDiffOutput1: Unit =
- compileFile("../tests/partest-test/runDiffOutput1.scala", defaultOptions).expectFailure.run()
+ compileFile("../tests/partest-test/runDiffOutput1.scala", defaultOptions).expectFailure.checkRuns()
}