From c2ea05c889eec9271f18223bff198de324405a51 Mon Sep 17 00:00:00 2001
From: Nicolas Stucki <nicolas.stucki@gmail.com>
Date: Mon, 28 Aug 2017 13:52:56 +0200
Subject: [PATCH] Fix flags for -optimise tests

---
 .../test/dotty/tools/dotc/CompilationTests.scala     | 12 ++++++++++--
 tests/pos/t2171.flags                                |  1 -
 tests/run/blame_eye_triple_eee-double.flags          |  1 -
 tests/run/blame_eye_triple_eee-float.flags           |  1 -
 tests/run/constant-optimization.flags                |  1 -
 tests/run/i3018.flags                                |  1 -
 tests/run/optimizer-array-load.flags                 |  1 -
 tests/run/run-bug4840.flags                          |  1 -
 tests/run/t8888.flags                                |  1 -
 9 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 tests/pos/t2171.flags
 delete mode 100644 tests/run/blame_eye_triple_eee-double.flags
 delete mode 100644 tests/run/blame_eye_triple_eee-float.flags
 delete mode 100644 tests/run/constant-optimization.flags
 delete mode 100644 tests/run/i3018.flags
 delete mode 100644 tests/run/optimizer-array-load.flags
 delete mode 100644 tests/run/run-bug4840.flags
 delete mode 100644 tests/run/t8888.flags

diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index 7c65516ba015..179b1e877f11 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -63,6 +63,7 @@ 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(
@@ -177,8 +178,15 @@ class CompilationTests extends ParallelTesting {
 
   // Run tests -----------------------------------------------------------------
 
-  @Test def runAll: Unit =
-    compileFilesInDir("../tests/run", defaultOptions).checkRuns()
+  @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)
+  }.checkRuns()
 
   // Pickling Tests ------------------------------------------------------------
   //
diff --git a/tests/pos/t2171.flags b/tests/pos/t2171.flags
deleted file mode 100644
index eb4d19bcb91a..000000000000
--- a/tests/pos/t2171.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise
\ No newline at end of file
diff --git a/tests/run/blame_eye_triple_eee-double.flags b/tests/run/blame_eye_triple_eee-double.flags
deleted file mode 100644
index c9b68d70dc6a..000000000000
--- a/tests/run/blame_eye_triple_eee-double.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise
diff --git a/tests/run/blame_eye_triple_eee-float.flags b/tests/run/blame_eye_triple_eee-float.flags
deleted file mode 100644
index c9b68d70dc6a..000000000000
--- a/tests/run/blame_eye_triple_eee-float.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise
diff --git a/tests/run/constant-optimization.flags b/tests/run/constant-optimization.flags
deleted file mode 100644
index c9b68d70dc6a..000000000000
--- a/tests/run/constant-optimization.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise
diff --git a/tests/run/i3018.flags b/tests/run/i3018.flags
deleted file mode 100644
index c9b68d70dc6a..000000000000
--- a/tests/run/i3018.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise
diff --git a/tests/run/optimizer-array-load.flags b/tests/run/optimizer-array-load.flags
deleted file mode 100644
index eb4d19bcb91a..000000000000
--- a/tests/run/optimizer-array-load.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise
\ No newline at end of file
diff --git a/tests/run/run-bug4840.flags b/tests/run/run-bug4840.flags
deleted file mode 100644
index eb4d19bcb91a..000000000000
--- a/tests/run/run-bug4840.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise
\ No newline at end of file
diff --git a/tests/run/t8888.flags b/tests/run/t8888.flags
deleted file mode 100644
index 48b438ddf86a..000000000000
--- a/tests/run/t8888.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydelambdafy:method