From d2e50d92be4038bf0ec07a61caff7959b8f2a583 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Mon, 20 Mar 2017 15:40:13 +0100
Subject: Make compileList take test name arg

---
 compiler/test/dotty/tools/dotc/CompilationTests.scala | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'compiler/test/dotty/tools/dotc/CompilationTests.scala')

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",
-- 
cgit v1.2.3