Extract -Xlink-optimise tests from vulpix

Author: nicolasstucki

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -294,60 +294,6 @@ class CompilationTests extends ParallelTesting {
     tests.foreach(_.delete())
   }
 
-  @Test def linkAll: Unit = {
-    // Setup and compile libraries
-    def strawmanLibrary =
-      compileDir("../collection-strawman/src/main", defaultOptions)
-    def linkCustomLib =
-      compileDir("../tests/link/custom-lib", defaultOptions)
-
-    val libraries = {
-      strawmanLibrary +
-      linkCustomLib
-    }.keepOutput.checkCompile()
-
-    // Setup class paths
-    def mkLinkClassPath(libPath: String) =
-      mkClassPath(libPath :: Jars.dottyTestDeps) ++ mkClassPath(Jars.dottyTestDeps, "-YRunClasspath")
-    val strawmanClassPath = mkLinkClassPath(defaultOutputDir + "strawmanLibrary/main/")
-    val customLibClassPath = mkLinkClassPath(defaultOutputDir + "linkCustomLib/custom-lib")
-
-    // Link tests
-    val linkDir = "../tests/link"
-    val linkStramanDir = linkDir + "/strawman"
-    val linkCustomLibDir = linkDir + "/on-custom-lib"
-    def linkStrawmanTest = compileFilesInDir(linkStramanDir, basicLinkOptimise ++ strawmanClassPath)
-    def linkCustomLibTest = compileFilesInDir(linkCustomLibDir, basicLinkOptimise ++ customLibClassPath)
-
-    def classFileChecks(sourceDir: String, testName: String) = {
-      val checkExt = ".classcheck"
-      for (check <- new JFile(sourceDir).listFiles().filter(_.toString.endsWith(checkExt))) {
-        val outDir = {
-          def path(str: String) = str.substring(linkDir.length, str.length - checkExt.length)
-          defaultOutputDir + testName + path(check.toString) + "/"
-        }
-        val expectedClasses = scala.io.Source.fromFile(check).getLines().toSet
-        val actualClasses = Files.walk(Paths.get(outDir)).iterator().asScala.collect {
-          case f if f.toString.endsWith(".class") => f.toString.substring(outDir.length, f.toString.length - ".class".length)
-        }.toSet
-        assertEquals(check.toString, expectedClasses, actualClasses)
-      }
-    }
-
-    // Run all tests
-    val tests = {
-      linkStrawmanTest +
-      linkCustomLibTest
-    }.keepOutput.checkRuns()
-
-    try {
-      classFileChecks(linkStramanDir, "linkStrawmanTest")
-      classFileChecks(linkCustomLibDir, "linkCustomLibTest")
-    } finally {
-      (libraries + tests).delete()
-    }
-  }
-
   private val (compilerSources, backendSources, backendJvmSources) = {
     val compilerDir = Paths.get("../compiler/src")
     val compilerSources0 = sources(Files.walk(compilerDir))

compiler/test/dotty/tools/dotc/LinkOptimiseTests.scala

@@ -0,0 +1,87 @@
+package dotty
+package tools
+package dotc
+
+import java.io.{File => JFile}
+import java.nio.file.{Files, Path, Paths}
+
+import org.junit.{AfterClass, Test}
+import org.junit.Assert._
+import vulpix.{ParallelTesting, SummaryReport, SummaryReporting, TestConfiguration}
+
+import scala.concurrent.duration._
+import scala.collection.JavaConverters._
+
+class LinkOptimiseTests extends ParallelTesting {
+  import TestConfiguration._
+  import LinkOptimiseTests._
+
+  // Test suite configuration --------------------------------------------------
+
+  def maxDuration = 30.seconds
+  def numberOfSlaves = 5
+  def safeMode = Properties.testsSafeMode
+  def isInteractive = SummaryReport.isInteractive
+  def testFilter = Properties.testsFilter
+
+
+  @Test def linkOptimise: Unit = {
+    // Setup and compile libraries
+    def strawmanLibrary =
+      compileDir("../collection-strawman/src/main", defaultOptions)
+    def linkCustomLib =
+      compileDir("../tests/link/custom-lib", defaultOptions)
+
+    val libraries = {
+      strawmanLibrary +
+      linkCustomLib
+    }.keepOutput.checkCompile()
+
+    // Setup class paths
+    def mkLinkClassPath(libPath: String) =
+      mkClassPath(libPath :: Jars.dottyTestDeps) ++ mkClassPath(Jars.dottyTestDeps, "-YRunClasspath")
+    val strawmanClassPath = mkLinkClassPath(defaultOutputDir + "strawmanLibrary/main/")
+    val customLibClassPath = mkLinkClassPath(defaultOutputDir + "linkCustomLib/custom-lib")
+
+    // Link tests
+    val linkDir = "../tests/link"
+    val linkStramanDir = linkDir + "/strawman"
+    val linkCustomLibDir = linkDir + "/on-custom-lib"
+    def linkStrawmanTest = compileFilesInDir(linkStramanDir, basicLinkOptimise ++ strawmanClassPath)
+    def linkCustomLibTest = compileFilesInDir(linkCustomLibDir, basicLinkOptimise ++ customLibClassPath)
+
+    def classFileChecks(sourceDir: String, testName: String) = {
+      val checkExt = ".classcheck"
+      for (check <- new JFile(sourceDir).listFiles().filter(_.toString.endsWith(checkExt))) {
+        val outDir = {
+          def path(str: String) = str.substring(linkDir.length, str.length - checkExt.length)
+          defaultOutputDir + testName + path(check.toString) + "/"
+        }
+        val expectedClasses = scala.io.Source.fromFile(check).getLines().toSet
+        val actualClasses = Files.walk(Paths.get(outDir)).iterator().asScala.collect {
+          case f if f.toString.endsWith(".class") => f.toString.substring(outDir.length, f.toString.length - ".class".length)
+        }.toSet
+        assertEquals(check.toString, expectedClasses, actualClasses)
+      }
+    }
+
+    // Run all tests
+    val tests = {
+      linkStrawmanTest +
+      linkCustomLibTest
+    }.keepOutput.checkRuns()
+
+    try {
+      classFileChecks(linkStramanDir, "linkStrawmanTest")
+      classFileChecks(linkCustomLibDir, "linkCustomLibTest")
+    } finally {
+      (libraries + tests).delete()
+    }
+  }
+
+}
+
+object LinkOptimiseTests {
+  implicit val summaryReport: SummaryReporting = new SummaryReport
+  @AfterClass def cleanup(): Unit = summaryReport.echoSummary()
+}