1 files changed, 16 insertions, 70 deletions

diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index 742b93fae..ff50d7238 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -2,19 +2,24 @@ package dotty
 package tools
 package dotc
 
-import org.junit.Test
-import java.io.{ File => JFile }
-import org.junit.experimental.categories.Category
+import org.junit.{ Test, BeforeClass, AfterClass }
 
 import scala.util.matching.Regex
+import scala.concurrent.duration._
 
-@Category(Array(classOf[ParallelTesting]))
-class CompilationTests extends ParallelSummaryReport with ParallelTesting {
+import vulpix.{ ParallelTesting, SummaryReport, SummaryReporting, TestConfiguration }
+
+class CompilationTests extends ParallelTesting {
+  import TestConfiguration._
   import CompilationTests._
 
-  def isInteractive: Boolean = ParallelSummaryReport.isInteractive
+  // Test suite configuration --------------------------------------------------
 
-  def testFilter: Option[Regex] = sys.props.get("dotty.partest.filter").map(r => new Regex(r))
+  def maxDuration = 180.seconds
+  def numberOfSlaves = 5
+  def safeMode = Properties.testsSafeMode
+  def isInteractive = SummaryReport.isInteractive
+  def testFilter = Properties.testsFilter
 
   // Positive tests ------------------------------------------------------------
 
@@ -211,9 +216,9 @@ class CompilationTests extends ParallelSummaryReport with ParallelTesting {
     val opt = Array(
       "-classpath",
       // compile with bootstrapped library on cp:
-      defaultOutputDir + "lib$1/src/:" +
+      defaultOutputDir + "lib/src/:" +
       // as well as bootstrapped compiler:
-      defaultOutputDir + "dotty1$1/dotty/:" +
+      defaultOutputDir + "dotty1/dotty/:" +
       Jars.dottyInterfaces
     )
 
@@ -248,65 +253,6 @@ class CompilationTests extends ParallelSummaryReport with ParallelTesting {
 }
 
 object CompilationTests {
-  implicit val defaultOutputDir: String = "../out/"
-
-  implicit class RichStringArray(val xs: Array[String]) extends AnyVal {
-    def and(args: String*): Array[String] = {
-      val argsArr: Array[String] = args.toArray
-      xs ++ argsArr
-    }
-  }
-
-  val noCheckOptions = Array(
-    "-pagewidth", "120",
-    "-color:never"
-  )
-
-  val checkOptions = Array(
-    "-Yno-deep-subtypes",
-    "-Yno-double-bindings",
-    "-Yforce-sbt-phases"
-  )
-
-  val classPath = {
-    val paths = Jars.dottyTestDeps map { p =>
-      val file = new JFile(p)
-      assert(
-        file.exists,
-        s"""|File "$p" couldn't be found. Run `packageAll` from build tool before
-            |testing.
-            |
-            |If running without sbt, test paths need to be setup environment variables:
-            |
-            | - DOTTY_LIBRARY
-            | - DOTTY_COMPILER
-            | - DOTTY_INTERFACES
-            | - DOTTY_EXTRAS
-            |
-            |Where these all contain locations, except extras which is a colon
-            |separated list of jars.
-            |
-            |When compiling with eclipse, you need the sbt-interfaces jar, put
-            |it in extras."""
-      )
-      file.getAbsolutePath
-    } mkString (":")
-
-    Array("-classpath", paths)
-  }
-
-  private val yCheckOptions = Array("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef")
-
-  val defaultOptions = noCheckOptions ++ checkOptions ++ yCheckOptions ++ classPath
-  val allowDeepSubtypes = defaultOptions diff Array("-Yno-deep-subtypes")
-  val allowDoubleBindings = defaultOptions diff Array("-Yno-double-bindings")
-  val picklingOptions = defaultOptions ++ Array(
-    "-Xprint-types",
-    "-Ytest-pickler",
-    "-Ystop-after:pickler",
-    "-Yprintpos"
-  )
-  val scala2Mode = defaultOptions ++ Array("-language:Scala2")
-  val explicitUTF8 = defaultOptions ++ Array("-encoding", "UTF8")
-  val explicitUTF16 = defaultOptions ++ Array("-encoding", "UTF16")
+  implicit val summaryReport: SummaryReporting = new SummaryReport
+  @AfterClass def cleanup(): Unit = summaryReport.echoSummary()
 }