diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index f7ce979aa22c..a042477b3b26 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -199,11 +199,7 @@ class CompilationTests extends ParallelTesting { implicit val testGroup: TestGroup = TestGroup("runAll") compileFilesInDir("../tests/run", defaultOptions) + compileFilesInDir("../tests/run-no-optimise", defaultOptions) + - compileFile("../tests/run-special/quote-run-constants.scala", defaultRunWithCompilerOptions) + - compileFile("../tests/run-special/quote-run.scala", defaultRunWithCompilerOptions) + - compileFile("../tests/run-special/quote-run-2.scala", defaultRunWithCompilerOptions) + - compileFile("../tests/run-special/quote-run-large.scala", defaultRunWithCompilerOptions) + - compileFile("../tests/run-special/quote-run-staged-interpreter.scala", defaultRunWithCompilerOptions) + compileFilesInDir("../tests/run-with-compiler", defaultRunWithCompilerOptions) }.checkRuns() // Generic java signatures tests --------------------------------------------- diff --git a/project/scripts/sbtTests b/project/scripts/sbtTests index 17641aea4c56..4e5349a98f26 100755 --- a/project/scripts/sbtTests +++ b/project/scripts/sbtTests @@ -58,7 +58,7 @@ else fi echo "testing scala.quoted.Expr.run from sbt dotr" -./project/scripts/sbt ";dotc -classpath compiler/target/scala-2.12/classes tests/run-special/quote-run.scala; dotr -with-compiler Test" > sbtdot5.out +./project/scripts/sbt ";dotc -classpath compiler/target/scala-2.12/classes tests/run-with-compiler/quote-run.scala; dotr -with-compiler Test" > sbtdot5.out cat sbtdot5.out if grep -e "val a: Int = 3" sbtdot5.out; then echo "output ok" diff --git a/tests/run-special/quote-run-2.check b/tests/run-with-compiler/quote-run-2.check similarity index 100% rename from tests/run-special/quote-run-2.check rename to tests/run-with-compiler/quote-run-2.check diff --git a/tests/run-special/quote-run-2.scala b/tests/run-with-compiler/quote-run-2.scala similarity index 100% rename from tests/run-special/quote-run-2.scala rename to tests/run-with-compiler/quote-run-2.scala diff --git a/tests/run-special/quote-run-constants.check b/tests/run-with-compiler/quote-run-constants.check similarity index 100% rename from tests/run-special/quote-run-constants.check rename to tests/run-with-compiler/quote-run-constants.check diff --git a/tests/run-special/quote-run-constants.scala b/tests/run-with-compiler/quote-run-constants.scala similarity index 100% rename from tests/run-special/quote-run-constants.scala rename to tests/run-with-compiler/quote-run-constants.scala diff --git a/tests/run-special/quote-run-large.check b/tests/run-with-compiler/quote-run-large.check similarity index 100% rename from tests/run-special/quote-run-large.check rename to tests/run-with-compiler/quote-run-large.check diff --git a/tests/run-special/quote-run-large.scala b/tests/run-with-compiler/quote-run-large.scala similarity index 100% rename from tests/run-special/quote-run-large.scala rename to tests/run-with-compiler/quote-run-large.scala diff --git a/tests/run-special/quote-run-staged-interpreter.check b/tests/run-with-compiler/quote-run-staged-interpreter.check similarity index 100% rename from tests/run-special/quote-run-staged-interpreter.check rename to tests/run-with-compiler/quote-run-staged-interpreter.check diff --git a/tests/run-special/quote-run-staged-interpreter.scala b/tests/run-with-compiler/quote-run-staged-interpreter.scala similarity index 100% rename from tests/run-special/quote-run-staged-interpreter.scala rename to tests/run-with-compiler/quote-run-staged-interpreter.scala diff --git a/tests/run-special/quote-run.check b/tests/run-with-compiler/quote-run.check similarity index 100% rename from tests/run-special/quote-run.check rename to tests/run-with-compiler/quote-run.check diff --git a/tests/run-special/quote-run.scala b/tests/run-with-compiler/quote-run.scala similarity index 100% rename from tests/run-special/quote-run.scala rename to tests/run-with-compiler/quote-run.scala