Skip to content

Commit 2caa7ba

Browse files
committed
Fix output paths for optimised tests
1 parent e35a7be commit 2caa7ba

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class CompilationTests extends ParallelTesting {
6969
compileFilesInDir("../tests/pos-special/strawman-collections", defaultOptions) +
7070
compileFile("../scala2-library/src/library/scala/collection/immutable/IndexedSeq.scala", defaultOptions) +
7171
compileFile("../scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala", defaultOptions) +
72-
compileFile("../tests/pos/t2171.scala", defaultOptimised) +
7372
compileList(
7473
"parSetSubset",
7574
List(
@@ -92,7 +91,6 @@ class CompilationTests extends ParallelTesting {
9291
compileFilesInDir("../tests/new", defaultOptions) +
9392
compileFilesInDir("../tests/pos-scala2", scala2Mode) +
9493
compileFilesInDir("../tests/pos", defaultOptions) +
95-
compileFilesInDir("../tests/pos", defaultOptimised) +
9694
compileFilesInDir("../tests/pos-deep-subtype", allowDeepSubtypes) +
9795
compileFile(
9896
// succeeds despite -Xfatal-warnings because of -nowarn
@@ -162,7 +160,6 @@ class CompilationTests extends ParallelTesting {
162160
@Test def compileNeg: Unit = {
163161
compileShallowFilesInDir("../tests/neg", defaultOptions) +
164162
compileShallowFilesInDir("../tests/neg/no-optimise", defaultOptions) +
165-
compileShallowFilesInDir("../tests/neg", defaultOptimised) +
166163
compileFile("../tests/neg/customArgs/typers.scala", allowDoubleBindings) +
167164
compileFile("../tests/neg/customArgs/overrideClass.scala", scala2Mode) +
168165
compileFile("../tests/neg/customArgs/autoTuplingTest.scala", defaultOptions.and("-language:noAutoTupling")) +
@@ -190,13 +187,7 @@ class CompilationTests extends ParallelTesting {
190187

191188
@Test def runAll: Unit = {
192189
compileFilesInDir("../tests/run", defaultOptions) +
193-
compileFilesInDir("../tests/run", defaultOptimised) +
194-
compileFile("../tests/run/i3018.scala", defaultOptimised) +
195-
compileFile("../tests/run/blame_eye_triple_eee-double.scala", defaultOptimised) +
196-
compileFile("../tests/run/blame_eye_triple_eee-float.scala", defaultOptimised) +
197-
compileFile("../tests/run/run-bug4840.scala", defaultOptimised) +
198-
compileFile("../tests/run/optimizer-array-load.scala", defaultOptimised) +
199-
compileFile("../tests/run/constant-optimization.scala", defaultOptimised)
190+
compileFilesInDir("../tests/run-no-optimise", defaultOptions)
200191
}.checkRuns()
201192

202193
// Pickling Tests ------------------------------------------------------------
@@ -303,6 +294,13 @@ class CompilationTests extends ParallelTesting {
303294
tests.foreach(_.delete())
304295
}
305296

297+
@Test def testOptimised: Unit = {
298+
val outputDir = defaultOutputDir + "optimised/"
299+
compileFilesInDir("../tests/pos", defaultOptimised, outputDir).checkCompile()
300+
compileFilesInDir("../tests/run", defaultOptimised, outputDir).checkRuns()
301+
compileShallowFilesInDir("../tests/neg", defaultOptimised, outputDir).checkExpectedErrors()
302+
}
303+
306304
private val (compilerSources, backendSources, backendJvmSources) = {
307305
val compilerDir = Paths.get("../compiler/src")
308306
val compilerSources0 = sources(Files.walk(compilerDir))
File renamed without changes.

0 commit comments

Comments
 (0)