aboutsummaryrefslogtreecommitdiff
path: root/compiler/test/dotty/tools/dotc/CompilationTests.scala
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2017-03-20 15:40:13 +0100
committerFelix Mulder <felix.mulder@gmail.com>2017-03-29 10:33:24 +0200
commitd2e50d92be4038bf0ec07a61caff7959b8f2a583 (patch)
tree1d2eee9649e07bf7a4100c0a50d57aa8a0b85a37 /compiler/test/dotty/tools/dotc/CompilationTests.scala
parent40627780e12fa1b08d57f298e8a95fcde57f0601 (diff)
downloaddotty-d2e50d92be4038bf0ec07a61caff7959b8f2a583.tar.gz
dotty-d2e50d92be4038bf0ec07a61caff7959b8f2a583.tar.bz2
dotty-d2e50d92be4038bf0ec07a61caff7959b8f2a583.zip
Make compileList take test name arg
Diffstat (limited to 'compiler/test/dotty/tools/dotc/CompilationTests.scala')
-rw-r--r--compiler/test/dotty/tools/dotc/CompilationTests.scala10
1 files changed, 7 insertions, 3 deletions
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index 8136cb861..3283e11ef 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -10,14 +10,15 @@ class CompilationTests extends ParallelTesting {
// Positive tests ------------------------------------------------------------
- @Test def compilePos: Unit =
- compileFilesInDir("../tests/pos", defaultOptions).pos
+ @Test def compilePos: Unit = {
+ compileList("compileStdLib", StdLibSources.whitelisted, scala2Mode.and("-migration", "-Yno-inline")) +
+ compileFilesInDir("../tests/pos", defaultOptions)
+ }.pos()
@Test def compilePosScala2: Unit =
compileFilesInDir("../tests/pos-scala2", scala2Mode).pos()
@Test def compilePosMixedFlags: Unit = {
- compileList(StdLibSources.whitelisted, scala2Mode.and("-migration", "-Yno-inline")) +
compileFile("../tests/pos/nullarify.scala", defaultOptions.and("-Ycheck:nullarify")) +
// this guy sucks, he changes the sourcefile itself:
// compileFile("../tests/pos-scala2/rewrites.scala", scala2Mode.and("-rewrite")) +
@@ -25,6 +26,7 @@ class CompilationTests extends ParallelTesting {
compileFile("../tests/pos-special/utf8encoded.scala", explicitUTF8) +
compileFile("../tests/pos-special/utf16encoded.scala", explicitUTF16) +
compileList(
+ "compileMixed",
List(
"../tests/pos/B.scala",
"../scala-scala/src/library/scala/collection/immutable/Seq.scala",
@@ -40,6 +42,7 @@ class CompilationTests extends ParallelTesting {
compileFile("../scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala", defaultOptions) +
compileFile("../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala", defaultOptions) +
compileList(
+ "parSetSubset",
List(
"../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala",
"../scala-scala/src/library/scala/collection/parallel/mutable/ParSet.scala",
@@ -103,6 +106,7 @@ class CompilationTests extends ParallelTesting {
compileFile("../tests/pos/extmethods.scala", defaultOptions) +
compileFile("../tests/pos/companions.scala", defaultOptions) +
compileList(
+ "testNonCyclic",
List(
"../compiler/src/dotty/tools/dotc/CompilationUnit.scala",
"../compiler/src/dotty/tools/dotc/core/Types.scala",