@@ -69,7 +69,6 @@ class CompilationTests extends ParallelTesting {
69
69
compileFilesInDir(" ../tests/pos-special/strawman-collections" , defaultOptions) +
70
70
compileFile(" ../scala2-library/src/library/scala/collection/immutable/IndexedSeq.scala" , defaultOptions) +
71
71
compileFile(" ../scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala" , defaultOptions) +
72
- compileFile(" ../tests/pos/t2171.scala" , defaultOptimised) +
73
72
compileList(
74
73
" parSetSubset" ,
75
74
List (
@@ -92,7 +91,6 @@ class CompilationTests extends ParallelTesting {
92
91
compileFilesInDir(" ../tests/new" , defaultOptions) +
93
92
compileFilesInDir(" ../tests/pos-scala2" , scala2Mode) +
94
93
compileFilesInDir(" ../tests/pos" , defaultOptions) +
95
- compileFilesInDir(" ../tests/pos" , defaultOptimised) +
96
94
compileFilesInDir(" ../tests/pos-deep-subtype" , allowDeepSubtypes) +
97
95
compileFile(
98
96
// succeeds despite -Xfatal-warnings because of -nowarn
@@ -162,7 +160,6 @@ class CompilationTests extends ParallelTesting {
162
160
@ Test def compileNeg : Unit = {
163
161
compileShallowFilesInDir(" ../tests/neg" , defaultOptions) +
164
162
compileShallowFilesInDir(" ../tests/neg/no-optimise" , defaultOptions) +
165
- compileShallowFilesInDir(" ../tests/neg" , defaultOptimised) +
166
163
compileFile(" ../tests/neg/customArgs/typers.scala" , allowDoubleBindings) +
167
164
compileFile(" ../tests/neg/customArgs/overrideClass.scala" , scala2Mode) +
168
165
compileFile(" ../tests/neg/customArgs/autoTuplingTest.scala" , defaultOptions.and(" -language:noAutoTupling" )) +
@@ -190,13 +187,7 @@ class CompilationTests extends ParallelTesting {
190
187
191
188
@ Test def runAll : Unit = {
192
189
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)
200
191
}.checkRuns()
201
192
202
193
// Pickling Tests ------------------------------------------------------------
@@ -303,6 +294,13 @@ class CompilationTests extends ParallelTesting {
303
294
tests.foreach(_.delete())
304
295
}
305
296
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
+
306
304
private val (compilerSources, backendSources, backendJvmSources) = {
307
305
val compilerDir = Paths .get(" ../compiler/src" )
308
306
val compilerSources0 = sources(Files .walk(compilerDir))
0 commit comments