Fix output paths for optimised tests

Author: nicolasstucki

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

@@ -68,7 +68,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(
@@ -91,7 +90,6 @@ class CompilationTests extends ParallelTesting {
     compileFilesInDir("../tests/new", defaultOptions) +
     compileFilesInDir("../tests/pos-scala2", scala2Mode) +
     compileFilesInDir("../tests/pos", defaultOptions) +
-    compileFilesInDir("../tests/pos", defaultOptimised) +
     compileFilesInDir("../tests/pos-deep-subtype", allowDeepSubtypes) +
     compileFile(
       // succeeds despite -Xfatal-warnings because of -nowarn
@@ -161,7 +159,6 @@ class CompilationTests extends ParallelTesting {
   @Test def compileNeg: Unit = {
     compileShallowFilesInDir("../tests/neg", defaultOptions) +
     compileShallowFilesInDir("../tests/neg/no-optimise", defaultOptions) +
-    compileShallowFilesInDir("../tests/neg", defaultOptimised) +
     compileFile("../tests/neg/customArgs/typers.scala", allowDoubleBindings) +
     compileFile("../tests/neg/customArgs/overrideClass.scala", scala2Mode) +
     compileFile("../tests/neg/customArgs/autoTuplingTest.scala", defaultOptions.and("-language:noAutoTupling")) +
@@ -189,13 +186,7 @@ class CompilationTests extends ParallelTesting {
 
   @Test def runAll: Unit = {
     compileFilesInDir("../tests/run", defaultOptions) +
-    compileFilesInDir("../tests/run", defaultOptimised) +
-    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 ------------------------------------------------------------
@@ -302,6 +293,13 @@ class CompilationTests extends ParallelTesting {
     tests.foreach(_.delete())
   }
 
+  @Test def testOptimised: Unit = {
+    def outputDirOptimised: OutDirectory = new OutDirectory(implicitly[OutDirectory] + "optimised/")
+    compileFilesInDir("../tests/pos", defaultOptimised)(outputDirOptimised).checkCompile()
+    compileFilesInDir("../tests/run", defaultOptimised)(outputDirOptimised).checkRuns()
+    compileShallowFilesInDir("../tests/neg", defaultOptimised)(outputDirOptimised).checkExpectedErrors()
+  }
+
   private val (compilerSources, backendSources, backendJvmSources) = {
     val compilerDir = Paths.get("../compiler/src")
     val compilerSources0 = sources(Files.walk(compilerDir))