Merge pull request #3164 from dotty-staging/enable-tests-on-optimise-3

Revert "Revert "Add regression tests on optimise""

Author: nicolasstucki

compiler/test/dotc/comptest.scala

@@ -12,8 +12,6 @@ object comptest extends ParallelTesting {
   def isInteractive = true
   def testFilter = None
 
-  implicit val defaultOutputDir: String = "."
-
   val posDir = "./tests/pos/"
   val negDir = "./tests/neg/"
   val dotcDir = "./src/dotty/"
@@ -26,6 +24,7 @@ object comptest extends ParallelTesting {
         dotcDir + "tools/dotc/core/Types.scala",
         dotcDir + "tools/dotc/ast/Trees.scala"
       ),
-      TestFlags("", Array("-Ylog:frontend", "-Xprompt"))
+      TestFlags("", Array("-Ylog:frontend", "-Xprompt")),
+      outDirectory = "."
   )
 }

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

@@ -15,6 +15,7 @@ import dotty.tools.io.JFile
 
 
 class CompilationTests extends ParallelTesting {
+  import ParallelTesting._
   import TestConfiguration._
   import CompilationTests._
 
@@ -68,7 +69,6 @@ class CompilationTests extends ParallelTesting {
     compileFilesInDir("../tests/pos-special/strawman-collections", defaultOptions) +
     compileFile("../scala2-library/src/library/scala/collection/immutable/IndexedSeq.scala", defaultOptions) +
     compileFile("../scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala", defaultOptions) +
-    compileFile("../tests/pos/t2171.scala", defaultOptimised) +
     compileList(
       "parSetSubset",
       List(
@@ -159,6 +159,7 @@ class CompilationTests extends ParallelTesting {
 
   @Test def compileNeg: Unit = {
     compileShallowFilesInDir("../tests/neg", defaultOptions) +
+    compileShallowFilesInDir("../tests/neg/no-optimise", defaultOptions) +
     compileFile("../tests/neg/customArgs/typers.scala", allowDoubleBindings) +
     compileFile("../tests/neg/customArgs/overrideClass.scala", scala2Mode) +
     compileFile("../tests/neg/customArgs/autoTuplingTest.scala", defaultOptions.and("-language:noAutoTupling")) +
@@ -186,12 +187,7 @@ class CompilationTests extends ParallelTesting {
 
   @Test def runAll: Unit = {
     compileFilesInDir("../tests/run", defaultOptions) +
-    compileFile("../tests/run/i3018.scala", defaultOptimised) +
-    compileFile("../tests/run/blame_eye_triple_eee-double.scala", defaultOptimised) +
-    compileFile("../tests/run/blame_eye_triple_eee-float.scala", defaultOptimised) +
-    compileFile("../tests/run/run-bug4840.scala", defaultOptimised) +
-    compileFile("../tests/run/optimizer-array-load.scala", defaultOptimised) +
-    compileFile("../tests/run/constant-optimization.scala", defaultOptimised)
+    compileFilesInDir("../tests/run-no-optimise", defaultOptions)
   }.checkRuns()
 
   // Pickling Tests ------------------------------------------------------------
@@ -298,6 +294,13 @@ class CompilationTests extends ParallelTesting {
     tests.foreach(_.delete())
   }
 
+  @Test def testOptimised: Unit = {
+    val outputDir = defaultOutputDir + "optimised/"
+    compileFilesInDir("../tests/pos", defaultOptimised, outputDir).checkCompile()
+    compileFilesInDir("../tests/run", defaultOptimised, outputDir).checkRuns()
+    compileShallowFilesInDir("../tests/neg", defaultOptimised, outputDir).checkExpectedErrors()
+  }
+
   private val (compilerSources, backendSources, backendJvmSources) = {
     val compilerDir = Paths.get("../compiler/src")
     val compilerSources0 = sources(Files.walk(compilerDir))

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

@@ -13,6 +13,7 @@ import scala.concurrent.duration._
 import scala.collection.JavaConverters._
 
 class LinkOptimiseTests extends ParallelTesting {
+  import ParallelTesting._
   import TestConfiguration._
   import LinkOptimiseTests._
 

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -1057,7 +1057,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
   }
 
   /** Compiles a single file from the string path `f` using the supplied flags */
-  def compileFile(f: String, flags: TestFlags)(implicit outDirectory: String): CompilationTest = {
+  def compileFile(f: String, flags: TestFlags, outDirectory: String = defaultOutputDir): CompilationTest = {
     val callingMethod = getCallingMethod()
     val sourceFile = new JFile(f)
     val parent = sourceFile.getParentFile
@@ -1087,7 +1087,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    *  By default, files are compiled in alphabetical order. An optional seed
    *  can be used for randomization.
    */
-  def compileDir(f: String, flags: TestFlags, randomOrder: Option[Int] = None)(implicit outDirectory: String): CompilationTest = {
+  def compileDir(f: String, flags: TestFlags, randomOrder: Option[Int] = None, outDirectory: String = defaultOutputDir): CompilationTest = {
     val callingMethod = getCallingMethod()
     val outDir = outDirectory + callingMethod + "/"
     val sourceDir = new JFile(f)
@@ -1116,7 +1116,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    *  `testName` since files can be in separate directories and or be otherwise
    *  dissociated
    */
-  def compileList(testName: String, files: List[String], flags: TestFlags, callingMethod: String = getCallingMethod())(implicit outDirectory: String): CompilationTest = {
+  def compileList(testName: String, files: List[String], flags: TestFlags, callingMethod: String = getCallingMethod(), outDirectory: String = defaultOutputDir): CompilationTest = {
     val outDir = outDirectory + callingMethod + "/" + testName + "/"
 
     // Directories in which to compile all containing files with `flags`:
@@ -1147,7 +1147,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    *  - Directories can have an associated check-file, where the check file has
    *    the same name as the directory (with the file extension `.check`)
    */
-  def compileFilesInDir(f: String, flags: TestFlags)(implicit outDirectory: String): CompilationTest = {
+  def compileFilesInDir(f: String, flags: TestFlags, outDirectory: String = defaultOutputDir): CompilationTest = {
     val callingMethod = getCallingMethod()
     val outDir = outDirectory + callingMethod + "/"
     val sourceDir = new JFile(f)
@@ -1167,7 +1167,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    *  sub-directories and as such, does **not** perform separate compilation
    *  tests.
    */
-  def compileShallowFilesInDir(f: String, flags: TestFlags)(implicit outDirectory: String): CompilationTest = {
+  def compileShallowFilesInDir(f: String, flags: TestFlags, outDirectory: String = defaultOutputDir): CompilationTest = {
     val callingMethod = getCallingMethod()
     val outDir = outDirectory + callingMethod + "/"
     val sourceDir = new JFile(f)
@@ -1185,6 +1185,9 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 }
 
 object ParallelTesting {
+
+  def defaultOutputDir: String = "../out/"
+
   def isSourceFile(f: JFile): Boolean = {
     val name = f.getName
     name.endsWith(".scala") || name.endsWith(".java")

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

@@ -3,7 +3,6 @@ package tools
 package vulpix
 
 object TestConfiguration {
-  implicit val defaultOutputDir: String = "../out/"
 
   val noCheckOptions = Array(
     "-pagewidth", "120",