From 3db70e6f27966c2a954d5d944a2885c501fd380f Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Tue, 22 Jan 2019 22:59:36 +0100 Subject: [PATCH 1/4] Full bootstrap: Use Dotty as the reference compiler The non-bootstrapped compiler is now compiled by Dotty 0.14.0-RC1 instead of Scala 2.12.8. The bootstrapped compiler is compiled using the non-bootstrapped compiler as before. For now, we still support compilation with Scala 2.12, this is achieved by having separate `src-2.x` and `src-3.x` directory for the library. To use Scala 2.12 as the reference compiler, run: ++2.12.8 in sbt, or change `referenceVersion` to "2.12.8" in Build.scala. --- .drone.yml | 7 ++ compiler/test/dotty/tools/TestSources.scala | 1 - .../dotty/tools/dotc/CompilationTests.scala | 2 +- .../dotty/DottyPredef.scala | 0 .../dotty/internal/StringContext.scala | 0 .../scala/Tuple.scala | 0 .../scala/internal/Quoted.scala | 0 .../scala/internal/quoted/Matcher.scala | 0 .../scala/quoted/Type.scala | 0 .../scala/quoted/matching/Bind.scala | 0 .../scala/tasty/reflect/QuotedOps.scala | 0 .../scala/tasty/reflect/utils/TreeUtils.scala | 0 .../dotty/DottyPredef.scala | 0 .../dotty/internal/StringContext.scala | 0 .../scala/IArray.scala | 0 .../scala/Tuple.scala | 0 .../scala/compiletime/Shape.scala | 0 .../scala/compiletime/package.scala | 0 .../scala/internal/Quoted.scala | 0 .../scala/internal/quoted/Matcher.scala | 0 .../scala/quoted/Type.scala | 0 .../scala/quoted/matching/Bind.scala | 0 .../scala/quoted/package.scala | 0 .../scala/reflect/Generic.scala | 0 .../scala/reflect/GenericClass.scala | 0 .../scala/reflect/Mirror.scala | 0 .../scala/runtime/DynamicTuple.scala | 0 .../scala/tasty/reflect/QuotedOps.scala | 0 .../scala/tasty/reflect/utils/TreeUtils.scala | 0 .../scala/testing/typeChecks.scala | 0 library/src-bootstrapped/.keep | 0 library/src-non-bootstrapped/.keep | 0 project/Build.scala | 86 ++++++++++++------- 33 files changed, 65 insertions(+), 31 deletions(-) rename library/{src-non-bootstrapped => src-2.x}/dotty/DottyPredef.scala (100%) rename library/{src-non-bootstrapped => src-2.x}/dotty/internal/StringContext.scala (100%) rename library/{src-non-bootstrapped => src-2.x}/scala/Tuple.scala (100%) rename library/{src-non-bootstrapped => src-2.x}/scala/internal/Quoted.scala (100%) rename library/{src-non-bootstrapped => src-2.x}/scala/internal/quoted/Matcher.scala (100%) rename library/{src-non-bootstrapped => src-2.x}/scala/quoted/Type.scala (100%) rename library/{src-non-bootstrapped => src-2.x}/scala/quoted/matching/Bind.scala (100%) rename library/{src-non-bootstrapped => src-2.x}/scala/tasty/reflect/QuotedOps.scala (100%) rename library/{src-non-bootstrapped => src-2.x}/scala/tasty/reflect/utils/TreeUtils.scala (100%) rename library/{src-bootstrapped => src-3.x}/dotty/DottyPredef.scala (100%) rename library/{src-bootstrapped => src-3.x}/dotty/internal/StringContext.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/IArray.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/Tuple.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/compiletime/Shape.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/compiletime/package.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/internal/Quoted.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/internal/quoted/Matcher.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/quoted/Type.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/quoted/matching/Bind.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/quoted/package.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/reflect/Generic.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/reflect/GenericClass.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/reflect/Mirror.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/runtime/DynamicTuple.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/tasty/reflect/QuotedOps.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/tasty/reflect/utils/TreeUtils.scala (100%) rename library/{src-bootstrapped => src-3.x}/scala/testing/typeChecks.scala (100%) create mode 100644 library/src-bootstrapped/.keep create mode 100644 library/src-non-bootstrapped/.keep diff --git a/.drone.yml b/.drone.yml index d9d9d223b88a..1ccdfb4980cd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -52,6 +52,13 @@ pipeline: # sbt scripted tests are slow and only run on nightly or deployment event: [ tag, deployment ] + test_scala212: + group: test + image: lampepfl/dotty:2019-02-06 + commands: + - cp -R . /tmp/5/ && cd /tmp/5/ + - ./project/scripts/sbt ";++2.12.8 ;compile ;test" + # DOCUMENTATION: documentation: image: lampepfl/dotty:2019-02-06 diff --git a/compiler/test/dotty/tools/TestSources.scala b/compiler/test/dotty/tools/TestSources.scala index aff6ef0544c9..7e1560d146f6 100644 --- a/compiler/test/dotty/tools/TestSources.scala +++ b/compiler/test/dotty/tools/TestSources.scala @@ -65,7 +65,6 @@ object TestSources { .map(_.toString) .toList - assert(sources.nonEmpty) sources } finally files.close() diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index a4a32d7ebe8b..ce81eabc4f0c 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -232,7 +232,7 @@ class CompilationTests extends ParallelTesting { Array("-Ycheck-reentrant", "-Yemit-tasty-in-class") ) - val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-bootstrapped")) + val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-3.x"), Paths.get("library/src-bootstrapped")) val librarySources = libraryDirs.flatMap(sources(_)) val lib = diff --git a/library/src-non-bootstrapped/dotty/DottyPredef.scala b/library/src-2.x/dotty/DottyPredef.scala similarity index 100% rename from library/src-non-bootstrapped/dotty/DottyPredef.scala rename to library/src-2.x/dotty/DottyPredef.scala diff --git a/library/src-non-bootstrapped/dotty/internal/StringContext.scala b/library/src-2.x/dotty/internal/StringContext.scala similarity index 100% rename from library/src-non-bootstrapped/dotty/internal/StringContext.scala rename to library/src-2.x/dotty/internal/StringContext.scala diff --git a/library/src-non-bootstrapped/scala/Tuple.scala b/library/src-2.x/scala/Tuple.scala similarity index 100% rename from library/src-non-bootstrapped/scala/Tuple.scala rename to library/src-2.x/scala/Tuple.scala diff --git a/library/src-non-bootstrapped/scala/internal/Quoted.scala b/library/src-2.x/scala/internal/Quoted.scala similarity index 100% rename from library/src-non-bootstrapped/scala/internal/Quoted.scala rename to library/src-2.x/scala/internal/Quoted.scala diff --git a/library/src-non-bootstrapped/scala/internal/quoted/Matcher.scala b/library/src-2.x/scala/internal/quoted/Matcher.scala similarity index 100% rename from library/src-non-bootstrapped/scala/internal/quoted/Matcher.scala rename to library/src-2.x/scala/internal/quoted/Matcher.scala diff --git a/library/src-non-bootstrapped/scala/quoted/Type.scala b/library/src-2.x/scala/quoted/Type.scala similarity index 100% rename from library/src-non-bootstrapped/scala/quoted/Type.scala rename to library/src-2.x/scala/quoted/Type.scala diff --git a/library/src-non-bootstrapped/scala/quoted/matching/Bind.scala b/library/src-2.x/scala/quoted/matching/Bind.scala similarity index 100% rename from library/src-non-bootstrapped/scala/quoted/matching/Bind.scala rename to library/src-2.x/scala/quoted/matching/Bind.scala diff --git a/library/src-non-bootstrapped/scala/tasty/reflect/QuotedOps.scala b/library/src-2.x/scala/tasty/reflect/QuotedOps.scala similarity index 100% rename from library/src-non-bootstrapped/scala/tasty/reflect/QuotedOps.scala rename to library/src-2.x/scala/tasty/reflect/QuotedOps.scala diff --git a/library/src-non-bootstrapped/scala/tasty/reflect/utils/TreeUtils.scala b/library/src-2.x/scala/tasty/reflect/utils/TreeUtils.scala similarity index 100% rename from library/src-non-bootstrapped/scala/tasty/reflect/utils/TreeUtils.scala rename to library/src-2.x/scala/tasty/reflect/utils/TreeUtils.scala diff --git a/library/src-bootstrapped/dotty/DottyPredef.scala b/library/src-3.x/dotty/DottyPredef.scala similarity index 100% rename from library/src-bootstrapped/dotty/DottyPredef.scala rename to library/src-3.x/dotty/DottyPredef.scala diff --git a/library/src-bootstrapped/dotty/internal/StringContext.scala b/library/src-3.x/dotty/internal/StringContext.scala similarity index 100% rename from library/src-bootstrapped/dotty/internal/StringContext.scala rename to library/src-3.x/dotty/internal/StringContext.scala diff --git a/library/src-bootstrapped/scala/IArray.scala b/library/src-3.x/scala/IArray.scala similarity index 100% rename from library/src-bootstrapped/scala/IArray.scala rename to library/src-3.x/scala/IArray.scala diff --git a/library/src-bootstrapped/scala/Tuple.scala b/library/src-3.x/scala/Tuple.scala similarity index 100% rename from library/src-bootstrapped/scala/Tuple.scala rename to library/src-3.x/scala/Tuple.scala diff --git a/library/src-bootstrapped/scala/compiletime/Shape.scala b/library/src-3.x/scala/compiletime/Shape.scala similarity index 100% rename from library/src-bootstrapped/scala/compiletime/Shape.scala rename to library/src-3.x/scala/compiletime/Shape.scala diff --git a/library/src-bootstrapped/scala/compiletime/package.scala b/library/src-3.x/scala/compiletime/package.scala similarity index 100% rename from library/src-bootstrapped/scala/compiletime/package.scala rename to library/src-3.x/scala/compiletime/package.scala diff --git a/library/src-bootstrapped/scala/internal/Quoted.scala b/library/src-3.x/scala/internal/Quoted.scala similarity index 100% rename from library/src-bootstrapped/scala/internal/Quoted.scala rename to library/src-3.x/scala/internal/Quoted.scala diff --git a/library/src-bootstrapped/scala/internal/quoted/Matcher.scala b/library/src-3.x/scala/internal/quoted/Matcher.scala similarity index 100% rename from library/src-bootstrapped/scala/internal/quoted/Matcher.scala rename to library/src-3.x/scala/internal/quoted/Matcher.scala diff --git a/library/src-bootstrapped/scala/quoted/Type.scala b/library/src-3.x/scala/quoted/Type.scala similarity index 100% rename from library/src-bootstrapped/scala/quoted/Type.scala rename to library/src-3.x/scala/quoted/Type.scala diff --git a/library/src-bootstrapped/scala/quoted/matching/Bind.scala b/library/src-3.x/scala/quoted/matching/Bind.scala similarity index 100% rename from library/src-bootstrapped/scala/quoted/matching/Bind.scala rename to library/src-3.x/scala/quoted/matching/Bind.scala diff --git a/library/src-bootstrapped/scala/quoted/package.scala b/library/src-3.x/scala/quoted/package.scala similarity index 100% rename from library/src-bootstrapped/scala/quoted/package.scala rename to library/src-3.x/scala/quoted/package.scala diff --git a/library/src-bootstrapped/scala/reflect/Generic.scala b/library/src-3.x/scala/reflect/Generic.scala similarity index 100% rename from library/src-bootstrapped/scala/reflect/Generic.scala rename to library/src-3.x/scala/reflect/Generic.scala diff --git a/library/src-bootstrapped/scala/reflect/GenericClass.scala b/library/src-3.x/scala/reflect/GenericClass.scala similarity index 100% rename from library/src-bootstrapped/scala/reflect/GenericClass.scala rename to library/src-3.x/scala/reflect/GenericClass.scala diff --git a/library/src-bootstrapped/scala/reflect/Mirror.scala b/library/src-3.x/scala/reflect/Mirror.scala similarity index 100% rename from library/src-bootstrapped/scala/reflect/Mirror.scala rename to library/src-3.x/scala/reflect/Mirror.scala diff --git a/library/src-bootstrapped/scala/runtime/DynamicTuple.scala b/library/src-3.x/scala/runtime/DynamicTuple.scala similarity index 100% rename from library/src-bootstrapped/scala/runtime/DynamicTuple.scala rename to library/src-3.x/scala/runtime/DynamicTuple.scala diff --git a/library/src-bootstrapped/scala/tasty/reflect/QuotedOps.scala b/library/src-3.x/scala/tasty/reflect/QuotedOps.scala similarity index 100% rename from library/src-bootstrapped/scala/tasty/reflect/QuotedOps.scala rename to library/src-3.x/scala/tasty/reflect/QuotedOps.scala diff --git a/library/src-bootstrapped/scala/tasty/reflect/utils/TreeUtils.scala b/library/src-3.x/scala/tasty/reflect/utils/TreeUtils.scala similarity index 100% rename from library/src-bootstrapped/scala/tasty/reflect/utils/TreeUtils.scala rename to library/src-3.x/scala/tasty/reflect/utils/TreeUtils.scala diff --git a/library/src-bootstrapped/scala/testing/typeChecks.scala b/library/src-3.x/scala/testing/typeChecks.scala similarity index 100% rename from library/src-bootstrapped/scala/testing/typeChecks.scala rename to library/src-3.x/scala/testing/typeChecks.scala diff --git a/library/src-bootstrapped/.keep b/library/src-bootstrapped/.keep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/library/src-non-bootstrapped/.keep b/library/src-non-bootstrapped/.keep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/project/Build.scala b/project/Build.scala index 02a16eabe950..0287cfcbd240 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -30,6 +30,7 @@ import scala.util.Properties.isJavaAtLeast object Build { val scalacVersion = "2.12.8" + val referenceVersion = "0.14.0-RC1" val baseVersion = "0.15.0" val baseSbtDottyVersion = "0.3.2" @@ -182,21 +183,31 @@ object Build { // Settings used for projects compiled only with Java lazy val commonJavaSettings = commonSettings ++ Seq( version := dottyVersion, - scalaVersion := scalacVersion, + scalaVersion := referenceVersion, + // To be removed once we stop cross-compiling with Scala 2 + crossScalaVersions := Seq(referenceVersion, scalacVersion), // Do not append Scala versions to the generated artifacts crossPaths := false, // Do not depend on the Scala library autoScalaLibrary := false ) - // Settings used when compiling dotty using Scala 2 - lazy val commonNonBootstrappedSettings = commonSettings ++ Seq( + // Settings used when compiling dotty (both non-boostrapped and bootstrapped) + lazy val commonDottySettings = commonSettings ++ Seq( + // Manually set the standard library to use + autoScalaLibrary := false + ) + + // Settings used when compiling dotty with the reference compiler + lazy val commonNonBootstrappedSettings = commonDottySettings ++ Seq( version := dottyNonBootstrappedVersion, - scalaVersion := scalacVersion + scalaVersion := referenceVersion, + // To be removed once we stop cross-compiling with Scala 2 + crossScalaVersions := Seq(referenceVersion, scalacVersion) ) // Settings used when compiling dotty with a non-bootstrapped dotty - lazy val commonBootstrappedSettings = commonSettings ++ Seq( + lazy val commonBootstrappedSettings = commonDottySettings ++ Seq( version := dottyVersion, scalaVersion := dottyNonBootstrappedVersion, @@ -219,11 +230,6 @@ object Build { // sbt gets very unhappy if two projects use the same target target := baseDirectory.value / ".." / "out" / "bootstrap" / name.value, - // The non-bootstrapped dotty-library is not necessary when bootstrapping dotty - autoScalaLibrary := false, - // ...but scala-library is - libraryDependencies += "org.scala-lang" % "scala-library" % scalacVersion, - // Compile using the non-bootstrapped and non-published dotty managedScalaInstance := false, scalaInstance := { @@ -463,13 +469,20 @@ object Build { List("-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1") else List() + val managedSrcDir = { + // Populate the directory + (managedSources in Compile).value + + (sourceManaged in Compile).value + } + val jarOpts = List( - "-Ddotty.tests.dottyCompilerManagedSources=" + (sourceManaged in Compile).value, + "-Ddotty.tests.dottyCompilerManagedSources=" + managedSrcDir, "-Ddotty.tests.classes.dottyInterfaces=" + jars("dotty-interfaces"), "-Ddotty.tests.classes.dottyLibrary=" + jars("dotty-library"), "-Ddotty.tests.classes.dottyCompiler=" + jars("dotty-compiler"), "-Ddotty.tests.classes.compilerInterface=" + findLib(attList, "compiler-interface"), - "-Ddotty.tests.classes.scalaLibrary=" + findLib(attList, "scala-library"), + "-Ddotty.tests.classes.scalaLibrary=" + findLib(attList, "scala-library-"), "-Ddotty.tests.classes.scalaAsm=" + findLib(attList, "scala-asm"), "-Ddotty.tests.classes.scalaXml=" + findLib(attList, "scala-xml"), "-Ddotty.tests.classes.jlineTerminal=" + findLib(attList, "jline-terminal"), @@ -527,9 +540,6 @@ object Build { } else if (scalaLib == "") { println("Couldn't find scala-library on classpath, please run using script in bin dir instead") } else if (args.contains("-with-compiler")) { - if (!isDotty.value) { - throw new MessageOnlyException("-with-compiler can only be used with a bootstrapped compiler") - } val args1 = args.filter(_ != "-with-compiler") val asm = findLib(attList, "scala-asm") val dottyCompiler = jars("dotty-compiler") @@ -578,9 +588,10 @@ object Build { ) def runCompilerMain(repl: Boolean = false) = Def.inputTaskDyn { + val log = streams.value.log val attList = (dependencyClasspath in Runtime).value val jars = packageAll.value - val scalaLib = findLib(attList, "scala-library") + val scalaLib = findLib(attList, "scala-library-") val dottyLib = jars("dotty-library") val dottyCompiler = jars("dotty-compiler") val args0: List[String] = spaceDelimited("").parsed.toList @@ -599,8 +610,8 @@ object Build { var extraClasspath = s"$scalaLib${File.pathSeparator}$dottyLib" if ((decompile || printTasty) && !args.contains("-classpath")) extraClasspath += s"${File.pathSeparator}." if (args0.contains("-with-compiler")) { - if (!isDotty.value) { - throw new MessageOnlyException("-with-compiler can only be used with a bootstrapped compiler") + if (scalaVersion.value == referenceVersion) { + log.error("-with-compiler should only be used with a bootstrapped compiler") } extraClasspath += s"${File.pathSeparator}$dottyCompiler" } @@ -664,15 +675,32 @@ object Build { // Settings shared between dotty-library and dotty-library-bootstrapped lazy val dottyLibrarySettings = Seq( libraryDependencies += "org.scala-lang" % "scala-library" % scalacVersion, + + // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called + scalacOptions in Compile ++= Seq("-sourcepath", (scalaSource in Compile).value.getAbsolutePath), + + // To be removed once we stop cross-compiling with Scala 2 + unmanagedSourceDirectories in Compile += { + val baseDir = baseDirectory.value + if (!isDotty.value) + baseDir / "src-2.x" + else + baseDir / "src-3.x" + }, + // Add version-specific source directories: - // - files in src-non-bootstrapped will only be compiled by the reference compiler (scalac) + // - files in src-non-bootstrapped will only be compiled by the reference compiler // - files in src-bootstrapped will only be compiled by the current dotty compiler (non-bootstrapped and bootstrapped) - unmanagedSourceDirectories in Compile += { + unmanagedSourceDirectories in Compile ++= { val baseDir = baseDirectory.value - if (isDotty.value) - baseDir / "src-bootstrapped" + if (isDotty.value) { + if (scalaVersion.value == referenceVersion) + Seq(baseDir / "src-non-bootstrapped") + else + Seq(baseDir / "src-bootstrapped") + } else - baseDir / "src-non-bootstrapped" + Seq() } ) @@ -949,8 +977,12 @@ object Build { val updateCommunityBuild = taskKey[Unit]("Updates the community build.") lazy val `community-build` = project.in(file("community-build")). - settings(commonNonBootstrappedSettings). + settings(commonSettings). settings( + scalaVersion := referenceVersion, + // To be removed once we stop cross-compiling with Scala 2 + crossScalaVersions := Seq(referenceVersion, scalacVersion), + prepareCommunityBuild := { (publishLocal in `dotty-sbt-bridge`).value (publishLocal in `dotty-interfaces`).value @@ -1095,11 +1127,7 @@ object Build { settings(dottyCompilerSettings) def asDottyLibrary(implicit mode: Mode): Project = project.withCommonSettings. - settings(dottyLibrarySettings). - bootstrappedSettings( - // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called. - scalacOptions in Compile ++= Seq("-sourcepath", (scalaSource in Compile).value.getAbsolutePath) - ) + settings(dottyLibrarySettings) def asDottyDoc(implicit mode: Mode): Project = project.withCommonSettings. dependsOn(dottyCompiler, dottyCompiler % "test->test"). From aed258247d33c87fe106346cdf6a5334ec199d71 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 21 Apr 2019 18:26:49 +0200 Subject: [PATCH 2/4] Only run macro tests with a bootstrapped compiler Compiling a macro with a non-bootstrapped compiler is fine, but running that macro in a subsequent compiler run as is usually done in macro tests is problematic since the MacroClassLoader is created using the compiler classpath (which contains a bootstrapped library) with the regular JVM classpath as parent classloader (which contains a non-bootstrapped library), this is inconsistent and could lead to various weird problems depending on the order in which things get loaded. One possible way to run these tests would be to always put the bootstrapped library on the JVM classpath, even if we're using the non-bootstrapped compiler, but this would cause test failures every time we would break binary compatibility. Instead, this commit moves the relevant tests to {pos,neg,run}-macros which will only be run with a bootstrapped compiler. To speed up development, it might be useful to add a flag to `testCompilation` that would put the bootstrapped library on the JVM classpath and still run these tests, but this is left as future work. --- .../dotc/BootstrappedOnlyCompilationTests.scala | 17 ++++++++++++++++- .../inline-case-objects/Macro_1.scala | 0 .../inline-case-objects/Main_2.scala | 0 .../Macro_1.scala | 0 .../Main_2.scala | 0 .../inline-option/Macro_1.scala | 0 .../inline-option/Main_2.scala | 0 .../inline-tuples-1/Macro_1.scala | 0 .../inline-tuples-1/Main_2.scala | 0 .../quote-MacroOverride.scala | 0 .../quote-complex-top-splice.scala | 0 .../quote-error-2/Macro_1.scala | 0 .../quote-error-2/Test_2.scala | 0 .../quote-error/Macro_1.scala | 0 .../quote-error/Test_2.scala | 0 .../quote-exception/Macro_1.scala | 0 .../quote-exception/Test_2.scala | 0 .../quote-interpolator-core-old.scala | 0 .../quote-macro-complex-arg-0.scala | 0 .../quote-macro-splice.scala | 0 .../{neg => neg-macros}/quote-pcp-in-arg.scala | 0 .../quote-splice-interpret-1.scala | 0 tests/{neg => neg-macros}/quote-this-b.scala | 0 tests/{neg => neg-macros}/quote-this.scala | 0 .../quote-whitebox/Macro_1.scala | 0 .../quote-whitebox/Test_2.scala | 0 .../splice-in-top-level-splice-1.scala | 0 .../splice-in-top-level-splice-2.scala | 0 .../tasty-macro-assert-1/quoted_1.scala | 0 .../tasty-macro-assert-1/quoted_2.scala | 0 .../tasty-macro-assert-2/quoted_1.scala | 0 .../tasty-macro-assert-2/quoted_2.scala | 0 .../tasty-macro-error/quoted_1.scala | 0 .../tasty-macro-error/quoted_2.scala | 0 .../tasty-macro-positions/quoted_1.scala | 0 .../tasty-macro-positions/quoted_2.scala | 0 .../Macro_1.scala | 0 .../Test_2.scala | 0 .../Macro_1.scala | 0 .../Test_2.scala | 0 tests/{pos => pos-macros}/i3898/quoted_1.scala | 0 tests/{pos => pos-macros}/i3898/quoted_2.scala | 0 tests/{pos => pos-macros}/i3898b/quoted_1.scala | 0 tests/{pos => pos-macros}/i3898b/quoted_2.scala | 0 tests/{pos => pos-macros}/i3898c/quoted_1.scala | 0 tests/{pos => pos-macros}/i3898c/quoted_2.scala | 0 tests/{pos => pos-macros}/i3912-1/i3912_1.scala | 0 tests/{pos => pos-macros}/i3912-1/i3912_2.scala | 0 tests/{pos => pos-macros}/i3912-2/i3912_1.scala | 0 tests/{pos => pos-macros}/i3912-2/i3912_2.scala | 0 tests/{pos => pos-macros}/i4023/Macro_1.scala | 0 tests/{pos => pos-macros}/i4023/Test_2.scala | 0 tests/{pos => pos-macros}/i4023b/Macro_1.scala | 0 tests/{pos => pos-macros}/i4023b/Test_2.scala | 0 tests/{pos => pos-macros}/i4023c/Macro_1.scala | 0 tests/{pos => pos-macros}/i4023c/Test_2.scala | 0 tests/{pos => pos-macros}/i4734/Macro_1.scala | 0 tests/{pos => pos-macros}/i4734/Test_2.scala | 0 tests/{pos => pos-macros}/i6171/Macro_1.scala | 0 tests/{pos => pos-macros}/i6171/Test_2.scala | 0 tests/{pos => pos-macros}/i6210/Macros_1.scala | 0 tests/{pos => pos-macros}/i6210/Test_2.scala | 0 .../macro-with-array/Macro_1.scala | 0 .../macro-with-array/Test_2.scala | 0 .../macro-with-type/Macro_1.scala | 0 .../macro-with-type/Test_2.scala | 0 .../power-macro/Macro_1.scala | 0 .../power-macro/PowerInlined-1_2.scala | 0 .../power-macro/PowerInlined-1k_2.scala | 0 .../quote-lift-inline-params/App_2.scala | 0 .../quote-lift-inline-params/Macro_1.scala | 0 .../quote-nested-object/Macro_1.scala | 0 .../quote-nested-object/Test_2.scala | 0 .../quote-whitebox-2/Macro_1.scala | 0 .../quote-whitebox-2/Test_2.scala | 0 .../tasty-constant-type/Macro_1.scala | 0 .../tasty-constant-type/Test_2.scala | 0 .../f-interpolation-1/FQuote_1.scala | 0 .../f-interpolation-1/Test_2.scala | 0 .../gestalt-optional-staging/Macro_1.scala | 0 .../gestalt-optional-staging/Test_2.scala | 0 .../gestalt-type-toolbox-reflect/Macro_1.scala | 0 .../gestalt-type-toolbox-reflect/Test_2.scala | 0 tests/{run => run-macros}/i4431.check | 0 tests/{run => run-macros}/i4431/quoted_1.scala | 0 tests/{run => run-macros}/i4431/quoted_2.scala | 0 tests/{run => run-macros}/i4455.check | 0 tests/{run => run-macros}/i4455/Macro_1.scala | 0 tests/{run => run-macros}/i4455/Test_2.scala | 0 tests/{run => run-macros}/i4492.check | 0 tests/{run => run-macros}/i4492/quoted_1.scala | 0 tests/{run => run-macros}/i4492/quoted_2.scala | 0 tests/{run => run-macros}/i4515/Macro_1.scala | 0 tests/{run => run-macros}/i4515/Test_2.scala | 0 tests/{run => run-macros}/i4515b/Macro_1.scala | 0 tests/{run => run-macros}/i4515b/Test_2.scala | 0 tests/{run => run-macros}/i4734.check | 0 tests/{run => run-macros}/i4734/Macro_1.scala | 0 tests/{run => run-macros}/i4734/Test_2.scala | 0 tests/{run => run-macros}/i4735.check | 0 tests/{run => run-macros}/i4735/App_2.scala | 0 tests/{run => run-macros}/i4735/Macro_1.scala | 0 tests/{run => run-macros}/i4803.check | 0 tests/{run => run-macros}/i4803/App_2.scala | 0 tests/{run => run-macros}/i4803/Macro_1.scala | 0 tests/{run => run-macros}/i4803b.check | 0 tests/{run => run-macros}/i4803b/App_2.scala | 0 tests/{run => run-macros}/i4803b/Macro_1.scala | 0 tests/{run => run-macros}/i4803c.check | 0 tests/{run => run-macros}/i4803c/App_2.scala | 0 tests/{run => run-macros}/i4803c/Macro_1.scala | 0 tests/{run => run-macros}/i4803e/App_2.scala | 0 tests/{run => run-macros}/i4803e/Macro_1.scala | 0 tests/{run => run-macros}/i4803f/App_2.scala | 0 tests/{run => run-macros}/i4803f/Macro_1.scala | 0 tests/{run => run-macros}/i4947e.check | 0 tests/{run => run-macros}/i4947e/Macro_1.scala | 0 tests/{run => run-macros}/i4947e/Test_2.scala | 0 tests/{run => run-macros}/i4947f.check | 0 tests/{run => run-macros}/i4947f/Macro_1.scala | 0 tests/{run => run-macros}/i4947f/Test_2.scala | 0 tests/{run => run-macros}/i5119.check | 0 tests/{run => run-macros}/i5119/Macro_1.scala | 0 tests/{run => run-macros}/i5119/Main_2.scala | 0 tests/{run => run-macros}/i5119b.check | 0 tests/{run => run-macros}/i5119b/Macro_1.scala | 0 tests/{run => run-macros}/i5119b/Main_2.scala | 0 tests/{run => run-macros}/i5188a.check | 0 tests/{run => run-macros}/i5188a/Macro_1.scala | 0 tests/{run => run-macros}/i5188a/Test_2.scala | 0 tests/{run => run-macros}/i5533.check | 0 tests/{run => run-macros}/i5533/Macro_1.scala | 0 tests/{run => run-macros}/i5533/Test_2.scala | 0 tests/{run => run-macros}/i5533b.check | 0 tests/{run => run-macros}/i5533b/Macro_1.scala | 3 +-- tests/{run => run-macros}/i5533b/Test_2.scala | 0 tests/{run => run-macros}/i5536/Macro_1.scala | 1 - tests/{run => run-macros}/i5536/Test_2.scala | 0 tests/{run => run-macros}/i5629/Macro_1.scala | 0 tests/{run => run-macros}/i5629/Test_2.scala | 0 .../i5715/Macro_1.scala | 0 .../i5715/Test_2.scala | 0 .../i5941/macro_1.scala | 0 .../i5941/usage_2.scala | 0 .../i6171/Macro_1.scala | 0 .../i6171/Test_2.scala | 0 .../i6253-b.check | 0 .../i6253-b/quoted_1.scala | 0 .../i6253-b/quoted_2.scala | 0 .../i6253.check | 0 .../i6253/quoted_1.scala | 0 .../i6253/quoted_2.scala | 0 .../inferred-repeated-result.check | 0 .../inferred-repeated-result/test_1.scala | 0 .../inferred-repeated-result/test_2.scala | 0 .../inline-case-objects.check | 0 .../inline-case-objects/Macro_1.scala | 0 .../inline-case-objects/Main_2.scala | 0 .../inline-macro-staged-interpreter.check | 0 .../Macro_1.scala | 0 .../Main_2.scala | 0 tests/{run => run-macros}/inline-option.check | 0 .../inline-option/Macro_1.scala | 0 .../inline-option/Main_2.scala | 0 tests/{run => run-macros}/inline-tuples-1.check | 0 .../inline-tuples-1/Macro_1.scala | 0 .../inline-tuples-1/Main_2.scala | 0 tests/{run => run-macros}/inline-tuples-2.check | 0 .../inline-tuples-2/Macro_1.scala | 0 .../inline-tuples-2/Main_2.scala | 0 .../{run => run-macros}/inline-varargs-1.check | 0 .../inline-varargs-1/Macro_1.scala | 0 .../inline-varargs-1/Main_2.scala | 0 .../{run => run-macros}/quote-and-splice.check | 0 .../quote-and-splice/Macros_1.scala | 0 .../quote-and-splice/Test_2.scala | 0 .../quote-change-owner.check | 0 .../quote-change-owner/Macro_1.scala | 0 .../quote-change-owner/Test_2.scala | 0 .../quote-elide-prefix/quoted_1.scala | 0 .../quote-elide-prefix/quoted_2.scala | 0 tests/{run => run-macros}/quote-force.check | 0 .../quote-force/quoted_1.scala | 0 .../quote-force/quoted_2.scala | 0 .../quote-impure-by-name.check | 0 .../quote-impure-by-name/quoted_1.scala | 0 .../quote-impure-by-name/quoted_2.scala | 0 .../quote-indexed-map-by-name/quoted_1.scala | 0 .../quote-indexed-map-by-name/quoted_2.scala | 0 .../quote-inline-function.check | 0 .../quote-inline-function/quoted_1.scala | 0 .../quote-inline-function/quoted_2.scala | 0 .../quote-matcher-runtime.check | 0 .../quote-matcher-runtime/quoted_1.scala | 0 .../quote-matcher-runtime/quoted_2.scala | 0 .../quote-matcher-string-interpolator-2.check | 0 .../quoted_1.scala | 0 .../quoted_2.scala | 0 .../quote-matcher-string-interpolator.check | 0 .../quoted_1.scala | 0 .../quoted_2.scala | 0 .../quote-matcher-symantics-1.check | 0 .../quote-matcher-symantics-1/quoted_1.scala | 0 .../quote-matcher-symantics-1/quoted_2.scala | 0 .../quote-matcher-symantics-2.check | 0 .../quote-matcher-symantics-2/quoted_1.scala | 0 .../quote-matcher-symantics-2/quoted_2.scala | 0 .../quote-sep-comp-2/Macro_1.scala | 0 .../quote-sep-comp-2/Test_2.scala | 0 tests/{run => run-macros}/quote-sep-comp.check | 0 .../quote-sep-comp/Macro_1.scala | 0 .../quote-sep-comp/Test_2.scala | 0 .../quote-simple-macro.check | 0 .../quote-simple-macro/quoted_1.scala | 0 .../quote-simple-macro/quoted_2.scala | 0 .../quote-unrolled-foreach.check | 0 .../quote-unrolled-foreach/quoted_1.scala | 0 .../quote-unrolled-foreach/quoted_2.scala | 0 tests/{run => run-macros}/quote-whitebox.check | 0 .../quote-whitebox/Macro_1.scala | 0 .../quote-whitebox/Test_2.scala | 0 .../reflect-select-constructor/assert_1.scala | 0 .../reflect-select-constructor/test_2.scala | 0 .../reflect-select-copy/assert_1.scala | 0 .../reflect-select-copy/assert_1.scala | 0 .../reflect-select-copy/test_2.scala | 0 .../reflect-select-copy/test_2.scala | 0 .../reflect-select-value-class/assert_1.scala | 0 .../reflect-select-value-class/test_2.scala | 0 .../reflect-typeChecks/assert_1.scala | 0 .../reflect-typeChecks/test_2.scala | 0 .../tasty-argument-tree-1.check | 0 .../tasty-argument-tree-1/quoted_1.scala | 0 .../tasty-argument-tree-1/quoted_2.scala | 0 .../{run => run-macros}/tasty-custom-show.check | 0 .../tasty-custom-show/quoted_1.scala | 0 .../tasty-custom-show/quoted_2.scala | 0 tests/{run => run-macros}/tasty-dealias.check | 0 .../tasty-dealias/quoted_1.scala | 0 .../tasty-dealias/quoted_2.scala | 0 .../tasty-definitions-1.check | 0 .../tasty-definitions-1/quoted_1.scala | 0 .../tasty-definitions-1/quoted_2.scala | 0 tests/{run => run-macros}/tasty-eval.check | 0 .../tasty-eval/quoted_1.scala | 0 .../tasty-eval/quoted_2.scala | 0 .../tasty-extractors-1.check | 0 .../tasty-extractors-1/quoted_1.scala | 0 .../tasty-extractors-1/quoted_2.scala | 0 .../tasty-extractors-2.check | 0 .../tasty-extractors-2/quoted_1.scala | 0 .../tasty-extractors-2/quoted_2.scala | 0 .../tasty-extractors-3.check | 0 .../tasty-extractors-3/quoted_1.scala | 0 .../tasty-extractors-3/quoted_2.scala | 0 .../tasty-extractors-constants-1.check | 0 .../tasty-extractors-constants-1/quoted_1.scala | 0 .../tasty-extractors-constants-1/quoted_2.scala | 0 .../tasty-extractors-types.check | 0 .../tasty-extractors-types/quoted_1.scala | 0 .../tasty-extractors-types/quoted_2.scala | 0 .../tasty-getfile-implicit-fun-context.check | 0 .../App_2.scala | 0 .../Macro_1.scala | 0 tests/{run => run-macros}/tasty-getfile.check | 0 .../tasty-getfile/App_2.scala | 0 .../tasty-getfile/Macro_1.scala | 0 .../tasty-implicit-fun-context-2.check | 0 .../tasty-implicit-fun-context-2/App_2.scala | 0 .../tasty-implicit-fun-context-2/Macro_1.scala | 0 .../tasty-indexed-map/quoted_1.scala | 0 .../tasty-indexed-map/quoted_2.scala | 0 .../tasty-interpolation-1.check | 0 .../tasty-interpolation-1/Macro.scala | 0 .../tasty-interpolation-1/Test_2.scala | 0 .../tasty-linenumber-2.check | 0 .../tasty-linenumber-2/quoted_1.scala | 0 .../tasty-linenumber-2/quoted_2.scala | 0 .../{run => run-macros}/tasty-linenumber.check | 0 .../tasty-linenumber/quoted_1.scala | 0 .../tasty-linenumber/quoted_2.scala | 0 tests/{run => run-macros}/tasty-location.check | 0 .../tasty-location/quoted_1.scala | 0 .../tasty-location/quoted_2.scala | 0 .../tasty-macro-assert.check | 0 .../tasty-macro-assert/quoted_1.scala | 0 .../tasty-macro-assert/quoted_2.scala | 0 .../tasty-macro-const/quoted_1.scala | 0 .../tasty-macro-const/quoted_2.scala | 0 .../tasty-macro-positions.check | 0 .../tasty-macro-positions/quoted_1.scala | 0 .../tasty-macro-positions/quoted_2.scala | 0 .../tasty-original-source.check | 0 .../tasty-original-source/Macros_1.scala | 0 .../tasty-original-source/Test_2.scala | 0 .../{run => run-macros}/tasty-positioned.check | 0 .../tasty-positioned/quoted_1.scala | 0 .../tasty-positioned/quoted_2.scala | 0 .../tasty-seal-method/quoted_1.scala | 0 .../tasty-seal-method/quoted_2.scala | 0 tests/{run => run-macros}/tasty-subtyping.check | 0 .../tasty-subtyping/quoted_1.scala | 0 .../tasty-subtyping/quoted_2.scala | 0 tests/{run => run-macros}/tasty-tree-map.check | 0 .../tasty-tree-map/quoted_1.scala | 0 .../tasty-tree-map/quoted_2.scala | 0 tests/{run => run-macros}/tasty-typeof.check | 0 .../tasty-typeof/Macro_1.scala | 0 .../tasty-typeof/Test_2.scala | 0 .../{run => run-macros}/type-show/Macro_1.scala | 0 .../{run => run-macros}/type-show/Test_2.scala | 0 .../xml-interpolation-1/Test_2.scala | 0 .../xml-interpolation-1/XmlQuote_1.scala | 0 .../xml-interpolation-2/Test_2.scala | 0 .../xml-interpolation-2/XmlQuote_1.scala | 0 .../xml-interpolation-3/Test_2.scala | 0 .../xml-interpolation-3/XmlQuote_1.scala | 0 .../xml-interpolation-4/Macros_1.scala | 0 .../xml-interpolation-4/Test_2.scala | 0 .../quote-splice-interpret-1.check | 2 -- 320 files changed, 17 insertions(+), 6 deletions(-) rename tests/{neg => neg-macros}/inline-case-objects/Macro_1.scala (100%) rename tests/{neg => neg-macros}/inline-case-objects/Main_2.scala (100%) rename tests/{neg => neg-macros}/inline-macro-staged-interpreter/Macro_1.scala (100%) rename tests/{neg => neg-macros}/inline-macro-staged-interpreter/Main_2.scala (100%) rename tests/{neg => neg-macros}/inline-option/Macro_1.scala (100%) rename tests/{neg => neg-macros}/inline-option/Main_2.scala (100%) rename tests/{neg => neg-macros}/inline-tuples-1/Macro_1.scala (100%) rename tests/{neg => neg-macros}/inline-tuples-1/Main_2.scala (100%) rename tests/{neg => neg-macros}/quote-MacroOverride.scala (100%) rename tests/{neg => neg-macros}/quote-complex-top-splice.scala (100%) rename tests/{neg => neg-macros}/quote-error-2/Macro_1.scala (100%) rename tests/{neg => neg-macros}/quote-error-2/Test_2.scala (100%) rename tests/{neg => neg-macros}/quote-error/Macro_1.scala (100%) rename tests/{neg => neg-macros}/quote-error/Test_2.scala (100%) rename tests/{neg => neg-macros}/quote-exception/Macro_1.scala (100%) rename tests/{neg => neg-macros}/quote-exception/Test_2.scala (100%) rename tests/{neg => neg-macros}/quote-interpolator-core-old.scala (100%) rename tests/{neg => neg-macros}/quote-macro-complex-arg-0.scala (100%) rename tests/{neg => neg-macros}/quote-macro-splice.scala (100%) rename tests/{neg => neg-macros}/quote-pcp-in-arg.scala (100%) rename tests/{neg => neg-macros}/quote-splice-interpret-1.scala (100%) rename tests/{neg => neg-macros}/quote-this-b.scala (100%) rename tests/{neg => neg-macros}/quote-this.scala (100%) rename tests/{neg => neg-macros}/quote-whitebox/Macro_1.scala (100%) rename tests/{neg => neg-macros}/quote-whitebox/Test_2.scala (100%) rename tests/{neg => neg-macros}/splice-in-top-level-splice-1.scala (100%) rename tests/{neg => neg-macros}/splice-in-top-level-splice-2.scala (100%) rename tests/{neg => neg-macros}/tasty-macro-assert-1/quoted_1.scala (100%) rename tests/{neg => neg-macros}/tasty-macro-assert-1/quoted_2.scala (100%) rename tests/{neg => neg-macros}/tasty-macro-assert-2/quoted_1.scala (100%) rename tests/{neg => neg-macros}/tasty-macro-assert-2/quoted_2.scala (100%) rename tests/{neg => neg-macros}/tasty-macro-error/quoted_1.scala (100%) rename tests/{neg => neg-macros}/tasty-macro-error/quoted_2.scala (100%) rename tests/{neg => neg-macros}/tasty-macro-positions/quoted_1.scala (100%) rename tests/{neg => neg-macros}/tasty-macro-positions/quoted_2.scala (100%) rename tests/{neg => neg-macros}/tasty-string-interpolator-position-a/Macro_1.scala (100%) rename tests/{neg => neg-macros}/tasty-string-interpolator-position-a/Test_2.scala (100%) rename tests/{neg => neg-macros}/tasty-string-interpolator-position-b/Macro_1.scala (100%) rename tests/{neg => neg-macros}/tasty-string-interpolator-position-b/Test_2.scala (100%) rename tests/{pos => pos-macros}/i3898/quoted_1.scala (100%) rename tests/{pos => pos-macros}/i3898/quoted_2.scala (100%) rename tests/{pos => pos-macros}/i3898b/quoted_1.scala (100%) rename tests/{pos => pos-macros}/i3898b/quoted_2.scala (100%) rename tests/{pos => pos-macros}/i3898c/quoted_1.scala (100%) rename tests/{pos => pos-macros}/i3898c/quoted_2.scala (100%) rename tests/{pos => pos-macros}/i3912-1/i3912_1.scala (100%) rename tests/{pos => pos-macros}/i3912-1/i3912_2.scala (100%) rename tests/{pos => pos-macros}/i3912-2/i3912_1.scala (100%) rename tests/{pos => pos-macros}/i3912-2/i3912_2.scala (100%) rename tests/{pos => pos-macros}/i4023/Macro_1.scala (100%) rename tests/{pos => pos-macros}/i4023/Test_2.scala (100%) rename tests/{pos => pos-macros}/i4023b/Macro_1.scala (100%) rename tests/{pos => pos-macros}/i4023b/Test_2.scala (100%) rename tests/{pos => pos-macros}/i4023c/Macro_1.scala (100%) rename tests/{pos => pos-macros}/i4023c/Test_2.scala (100%) rename tests/{pos => pos-macros}/i4734/Macro_1.scala (100%) rename tests/{pos => pos-macros}/i4734/Test_2.scala (100%) rename tests/{pos => pos-macros}/i6171/Macro_1.scala (100%) rename tests/{pos => pos-macros}/i6171/Test_2.scala (100%) rename tests/{pos => pos-macros}/i6210/Macros_1.scala (100%) rename tests/{pos => pos-macros}/i6210/Test_2.scala (100%) rename tests/{pos => pos-macros}/macro-with-array/Macro_1.scala (100%) rename tests/{pos => pos-macros}/macro-with-array/Test_2.scala (100%) rename tests/{pos => pos-macros}/macro-with-type/Macro_1.scala (100%) rename tests/{pos => pos-macros}/macro-with-type/Test_2.scala (100%) rename tests/{pos => pos-macros}/power-macro/Macro_1.scala (100%) rename tests/{pos => pos-macros}/power-macro/PowerInlined-1_2.scala (100%) rename tests/{pos => pos-macros}/power-macro/PowerInlined-1k_2.scala (100%) rename tests/{pos => pos-macros}/quote-lift-inline-params/App_2.scala (100%) rename tests/{pos => pos-macros}/quote-lift-inline-params/Macro_1.scala (100%) rename tests/{pos => pos-macros}/quote-nested-object/Macro_1.scala (100%) rename tests/{pos => pos-macros}/quote-nested-object/Test_2.scala (100%) rename tests/{pos => pos-macros}/quote-whitebox-2/Macro_1.scala (100%) rename tests/{pos => pos-macros}/quote-whitebox-2/Test_2.scala (100%) rename tests/{pos => pos-macros}/tasty-constant-type/Macro_1.scala (100%) rename tests/{pos => pos-macros}/tasty-constant-type/Test_2.scala (100%) rename tests/{run => run-macros}/f-interpolation-1/FQuote_1.scala (100%) rename tests/{run => run-macros}/f-interpolation-1/Test_2.scala (100%) rename tests/{run => run-macros}/gestalt-optional-staging/Macro_1.scala (100%) rename tests/{run => run-macros}/gestalt-optional-staging/Test_2.scala (100%) rename tests/{run => run-macros}/gestalt-type-toolbox-reflect/Macro_1.scala (100%) rename tests/{run => run-macros}/gestalt-type-toolbox-reflect/Test_2.scala (100%) rename tests/{run => run-macros}/i4431.check (100%) rename tests/{run => run-macros}/i4431/quoted_1.scala (100%) rename tests/{run => run-macros}/i4431/quoted_2.scala (100%) rename tests/{run => run-macros}/i4455.check (100%) rename tests/{run => run-macros}/i4455/Macro_1.scala (100%) rename tests/{run => run-macros}/i4455/Test_2.scala (100%) rename tests/{run => run-macros}/i4492.check (100%) rename tests/{run => run-macros}/i4492/quoted_1.scala (100%) rename tests/{run => run-macros}/i4492/quoted_2.scala (100%) rename tests/{run => run-macros}/i4515/Macro_1.scala (100%) rename tests/{run => run-macros}/i4515/Test_2.scala (100%) rename tests/{run => run-macros}/i4515b/Macro_1.scala (100%) rename tests/{run => run-macros}/i4515b/Test_2.scala (100%) rename tests/{run => run-macros}/i4734.check (100%) rename tests/{run => run-macros}/i4734/Macro_1.scala (100%) rename tests/{run => run-macros}/i4734/Test_2.scala (100%) rename tests/{run => run-macros}/i4735.check (100%) rename tests/{run => run-macros}/i4735/App_2.scala (100%) rename tests/{run => run-macros}/i4735/Macro_1.scala (100%) rename tests/{run => run-macros}/i4803.check (100%) rename tests/{run => run-macros}/i4803/App_2.scala (100%) rename tests/{run => run-macros}/i4803/Macro_1.scala (100%) rename tests/{run => run-macros}/i4803b.check (100%) rename tests/{run => run-macros}/i4803b/App_2.scala (100%) rename tests/{run => run-macros}/i4803b/Macro_1.scala (100%) rename tests/{run => run-macros}/i4803c.check (100%) rename tests/{run => run-macros}/i4803c/App_2.scala (100%) rename tests/{run => run-macros}/i4803c/Macro_1.scala (100%) rename tests/{run => run-macros}/i4803e/App_2.scala (100%) rename tests/{run => run-macros}/i4803e/Macro_1.scala (100%) rename tests/{run => run-macros}/i4803f/App_2.scala (100%) rename tests/{run => run-macros}/i4803f/Macro_1.scala (100%) rename tests/{run => run-macros}/i4947e.check (100%) rename tests/{run => run-macros}/i4947e/Macro_1.scala (100%) rename tests/{run => run-macros}/i4947e/Test_2.scala (100%) rename tests/{run => run-macros}/i4947f.check (100%) rename tests/{run => run-macros}/i4947f/Macro_1.scala (100%) rename tests/{run => run-macros}/i4947f/Test_2.scala (100%) rename tests/{run => run-macros}/i5119.check (100%) rename tests/{run => run-macros}/i5119/Macro_1.scala (100%) rename tests/{run => run-macros}/i5119/Main_2.scala (100%) rename tests/{run => run-macros}/i5119b.check (100%) rename tests/{run => run-macros}/i5119b/Macro_1.scala (100%) rename tests/{run => run-macros}/i5119b/Main_2.scala (100%) rename tests/{run => run-macros}/i5188a.check (100%) rename tests/{run => run-macros}/i5188a/Macro_1.scala (100%) rename tests/{run => run-macros}/i5188a/Test_2.scala (100%) rename tests/{run => run-macros}/i5533.check (100%) rename tests/{run => run-macros}/i5533/Macro_1.scala (100%) rename tests/{run => run-macros}/i5533/Test_2.scala (100%) rename tests/{run => run-macros}/i5533b.check (100%) rename tests/{run => run-macros}/i5533b/Macro_1.scala (88%) rename tests/{run => run-macros}/i5533b/Test_2.scala (100%) rename tests/{run => run-macros}/i5536/Macro_1.scala (87%) rename tests/{run => run-macros}/i5536/Test_2.scala (100%) rename tests/{run => run-macros}/i5629/Macro_1.scala (100%) rename tests/{run => run-macros}/i5629/Test_2.scala (100%) rename tests/{run-with-compiler => run-macros}/i5715/Macro_1.scala (100%) rename tests/{run-with-compiler => run-macros}/i5715/Test_2.scala (100%) rename tests/{run-with-compiler => run-macros}/i5941/macro_1.scala (100%) rename tests/{run-with-compiler => run-macros}/i5941/usage_2.scala (100%) rename tests/{run-with-compiler => run-macros}/i6171/Macro_1.scala (100%) rename tests/{run-with-compiler => run-macros}/i6171/Test_2.scala (100%) rename tests/{run-with-compiler => run-macros}/i6253-b.check (100%) rename tests/{run-with-compiler => run-macros}/i6253-b/quoted_1.scala (100%) rename tests/{run-with-compiler => run-macros}/i6253-b/quoted_2.scala (100%) rename tests/{run-with-compiler => run-macros}/i6253.check (100%) rename tests/{run-with-compiler => run-macros}/i6253/quoted_1.scala (100%) rename tests/{run-with-compiler => run-macros}/i6253/quoted_2.scala (100%) rename tests/{run => run-macros}/inferred-repeated-result.check (100%) rename tests/{run => run-macros}/inferred-repeated-result/test_1.scala (100%) rename tests/{run => run-macros}/inferred-repeated-result/test_2.scala (100%) rename tests/{run => run-macros}/inline-case-objects.check (100%) rename tests/{run => run-macros}/inline-case-objects/Macro_1.scala (100%) rename tests/{run => run-macros}/inline-case-objects/Main_2.scala (100%) rename tests/{run => run-macros}/inline-macro-staged-interpreter.check (100%) rename tests/{run => run-macros}/inline-macro-staged-interpreter/Macro_1.scala (100%) rename tests/{run => run-macros}/inline-macro-staged-interpreter/Main_2.scala (100%) rename tests/{run => run-macros}/inline-option.check (100%) rename tests/{run => run-macros}/inline-option/Macro_1.scala (100%) rename tests/{run => run-macros}/inline-option/Main_2.scala (100%) rename tests/{run => run-macros}/inline-tuples-1.check (100%) rename tests/{run => run-macros}/inline-tuples-1/Macro_1.scala (100%) rename tests/{run => run-macros}/inline-tuples-1/Main_2.scala (100%) rename tests/{run => run-macros}/inline-tuples-2.check (100%) rename tests/{run => run-macros}/inline-tuples-2/Macro_1.scala (100%) rename tests/{run => run-macros}/inline-tuples-2/Main_2.scala (100%) rename tests/{run => run-macros}/inline-varargs-1.check (100%) rename tests/{run => run-macros}/inline-varargs-1/Macro_1.scala (100%) rename tests/{run => run-macros}/inline-varargs-1/Main_2.scala (100%) rename tests/{run => run-macros}/quote-and-splice.check (100%) rename tests/{run => run-macros}/quote-and-splice/Macros_1.scala (100%) rename tests/{run => run-macros}/quote-and-splice/Test_2.scala (100%) rename tests/{run => run-macros}/quote-change-owner.check (100%) rename tests/{run => run-macros}/quote-change-owner/Macro_1.scala (100%) rename tests/{run => run-macros}/quote-change-owner/Test_2.scala (100%) rename tests/{run => run-macros}/quote-elide-prefix/quoted_1.scala (100%) rename tests/{run => run-macros}/quote-elide-prefix/quoted_2.scala (100%) rename tests/{run => run-macros}/quote-force.check (100%) rename tests/{run => run-macros}/quote-force/quoted_1.scala (100%) rename tests/{run => run-macros}/quote-force/quoted_2.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-impure-by-name.check (100%) rename tests/{run-with-compiler => run-macros}/quote-impure-by-name/quoted_1.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-impure-by-name/quoted_2.scala (100%) rename tests/{run => run-macros}/quote-indexed-map-by-name/quoted_1.scala (100%) rename tests/{run => run-macros}/quote-indexed-map-by-name/quoted_2.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-inline-function.check (100%) rename tests/{run-with-compiler => run-macros}/quote-inline-function/quoted_1.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-inline-function/quoted_2.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-runtime.check (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-runtime/quoted_1.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-runtime/quoted_2.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-string-interpolator-2.check (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-string-interpolator-2/quoted_1.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-string-interpolator-2/quoted_2.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-string-interpolator.check (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-string-interpolator/quoted_1.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-string-interpolator/quoted_2.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-symantics-1.check (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-symantics-1/quoted_1.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-symantics-1/quoted_2.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-symantics-2.check (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-symantics-2/quoted_1.scala (100%) rename tests/{run-with-compiler => run-macros}/quote-matcher-symantics-2/quoted_2.scala (100%) rename tests/{run => run-macros}/quote-sep-comp-2/Macro_1.scala (100%) rename tests/{run => run-macros}/quote-sep-comp-2/Test_2.scala (100%) rename tests/{run => run-macros}/quote-sep-comp.check (100%) rename tests/{run => run-macros}/quote-sep-comp/Macro_1.scala (100%) rename tests/{run => run-macros}/quote-sep-comp/Test_2.scala (100%) rename tests/{run => run-macros}/quote-simple-macro.check (100%) rename tests/{run => run-macros}/quote-simple-macro/quoted_1.scala (100%) rename tests/{run => run-macros}/quote-simple-macro/quoted_2.scala (100%) rename tests/{run => run-macros}/quote-unrolled-foreach.check (100%) rename tests/{run => run-macros}/quote-unrolled-foreach/quoted_1.scala (100%) rename tests/{run => run-macros}/quote-unrolled-foreach/quoted_2.scala (100%) rename tests/{run => run-macros}/quote-whitebox.check (100%) rename tests/{run => run-macros}/quote-whitebox/Macro_1.scala (100%) rename tests/{run => run-macros}/quote-whitebox/Test_2.scala (100%) rename tests/{run-with-compiler => run-macros}/reflect-select-constructor/assert_1.scala (100%) rename tests/{run-with-compiler => run-macros}/reflect-select-constructor/test_2.scala (100%) rename tests/{run => run-macros}/reflect-select-copy/assert_1.scala (100%) rename tests/{run-with-compiler => run-macros/reflect-select-copy}/reflect-select-copy/assert_1.scala (100%) rename tests/{run-with-compiler => run-macros/reflect-select-copy}/reflect-select-copy/test_2.scala (100%) rename tests/{run => run-macros}/reflect-select-copy/test_2.scala (100%) rename tests/{run-with-compiler => run-macros}/reflect-select-value-class/assert_1.scala (100%) rename tests/{run-with-compiler => run-macros}/reflect-select-value-class/test_2.scala (100%) rename tests/{run-with-compiler => run-macros}/reflect-typeChecks/assert_1.scala (100%) rename tests/{run-with-compiler => run-macros}/reflect-typeChecks/test_2.scala (100%) rename tests/{run => run-macros}/tasty-argument-tree-1.check (100%) rename tests/{run => run-macros}/tasty-argument-tree-1/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-argument-tree-1/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-custom-show.check (100%) rename tests/{run => run-macros}/tasty-custom-show/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-custom-show/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-dealias.check (100%) rename tests/{run => run-macros}/tasty-dealias/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-dealias/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-definitions-1.check (100%) rename tests/{run => run-macros}/tasty-definitions-1/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-definitions-1/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-eval.check (100%) rename tests/{run => run-macros}/tasty-eval/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-eval/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-extractors-1.check (100%) rename tests/{run => run-macros}/tasty-extractors-1/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-extractors-1/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-extractors-2.check (100%) rename tests/{run => run-macros}/tasty-extractors-2/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-extractors-2/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-extractors-3.check (100%) rename tests/{run => run-macros}/tasty-extractors-3/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-extractors-3/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-extractors-constants-1.check (100%) rename tests/{run => run-macros}/tasty-extractors-constants-1/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-extractors-constants-1/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-extractors-types.check (100%) rename tests/{run => run-macros}/tasty-extractors-types/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-extractors-types/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-getfile-implicit-fun-context.check (100%) rename tests/{run => run-macros}/tasty-getfile-implicit-fun-context/App_2.scala (100%) rename tests/{run => run-macros}/tasty-getfile-implicit-fun-context/Macro_1.scala (100%) rename tests/{run => run-macros}/tasty-getfile.check (100%) rename tests/{run => run-macros}/tasty-getfile/App_2.scala (100%) rename tests/{run => run-macros}/tasty-getfile/Macro_1.scala (100%) rename tests/{run => run-macros}/tasty-implicit-fun-context-2.check (100%) rename tests/{run => run-macros}/tasty-implicit-fun-context-2/App_2.scala (100%) rename tests/{run => run-macros}/tasty-implicit-fun-context-2/Macro_1.scala (100%) rename tests/{run => run-macros}/tasty-indexed-map/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-indexed-map/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-interpolation-1.check (100%) rename tests/{run => run-macros}/tasty-interpolation-1/Macro.scala (100%) rename tests/{run => run-macros}/tasty-interpolation-1/Test_2.scala (100%) rename tests/{run => run-macros}/tasty-linenumber-2.check (100%) rename tests/{run => run-macros}/tasty-linenumber-2/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-linenumber-2/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-linenumber.check (100%) rename tests/{run => run-macros}/tasty-linenumber/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-linenumber/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-location.check (100%) rename tests/{run => run-macros}/tasty-location/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-location/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-macro-assert.check (100%) rename tests/{run => run-macros}/tasty-macro-assert/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-macro-assert/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-macro-const/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-macro-const/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-macro-positions.check (100%) rename tests/{run => run-macros}/tasty-macro-positions/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-macro-positions/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-original-source.check (100%) rename tests/{run => run-macros}/tasty-original-source/Macros_1.scala (100%) rename tests/{run => run-macros}/tasty-original-source/Test_2.scala (100%) rename tests/{run => run-macros}/tasty-positioned.check (100%) rename tests/{run => run-macros}/tasty-positioned/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-positioned/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-seal-method/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-seal-method/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-subtyping.check (100%) rename tests/{run => run-macros}/tasty-subtyping/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-subtyping/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-tree-map.check (100%) rename tests/{run => run-macros}/tasty-tree-map/quoted_1.scala (100%) rename tests/{run => run-macros}/tasty-tree-map/quoted_2.scala (100%) rename tests/{run => run-macros}/tasty-typeof.check (100%) rename tests/{run => run-macros}/tasty-typeof/Macro_1.scala (100%) rename tests/{run => run-macros}/tasty-typeof/Test_2.scala (100%) rename tests/{run => run-macros}/type-show/Macro_1.scala (100%) rename tests/{run => run-macros}/type-show/Test_2.scala (100%) rename tests/{run => run-macros}/xml-interpolation-1/Test_2.scala (100%) rename tests/{run => run-macros}/xml-interpolation-1/XmlQuote_1.scala (100%) rename tests/{run => run-macros}/xml-interpolation-2/Test_2.scala (100%) rename tests/{run => run-macros}/xml-interpolation-2/XmlQuote_1.scala (100%) rename tests/{run => run-macros}/xml-interpolation-3/Test_2.scala (100%) rename tests/{run => run-macros}/xml-interpolation-3/XmlQuote_1.scala (100%) rename tests/{run => run-macros}/xml-interpolation-4/Macros_1.scala (100%) rename tests/{run => run-macros}/xml-interpolation-4/Test_2.scala (100%) delete mode 100644 tests/run-with-compiler/quote-splice-interpret-1.check diff --git a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala index 6a0a8b651654..495af702ac4e 100644 --- a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala @@ -29,6 +29,11 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting { // Positive tests ------------------------------------------------------------ + @Test def posMacros: Unit = { + implicit val testGroup: TestGroup = TestGroup("compilePosMacros") + compileFilesInDir("tests/pos-macros", defaultOptions) + }.checkCompile() + @Test def posWithCompiler: Unit = { implicit val testGroup: TestGroup = TestGroup("compilePosWithCompiler") compileFilesInDir("tests/pos-with-compiler", withCompilerOptions) + @@ -69,13 +74,23 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting { // Negative tests ------------------------------------------------------------ - @Test def negAll: Unit = { + @Test def negMacros: Unit = { + implicit val testGroup: TestGroup = TestGroup("compileNegWithCompiler") + compileFilesInDir("tests/neg-macros", defaultOptions) + }.checkExpectedErrors() + + @Test def negWithCompiler: Unit = { implicit val testGroup: TestGroup = TestGroup("compileNegWithCompiler") compileFilesInDir("tests/neg-with-compiler", withCompilerOptions) }.checkExpectedErrors() // Run tests ----------------------------------------------------------------- + @Test def runMacros: Unit = { + implicit val testGroup: TestGroup = TestGroup("runMacros") + compileFilesInDir("tests/run-macros", defaultOptions) + }.checkRuns() + @Test def runWithCompiler: Unit = { implicit val testGroup: TestGroup = TestGroup("runWithCompiler") compileFilesInDir("tests/run-with-compiler", withCompilerOptions) + diff --git a/tests/neg/inline-case-objects/Macro_1.scala b/tests/neg-macros/inline-case-objects/Macro_1.scala similarity index 100% rename from tests/neg/inline-case-objects/Macro_1.scala rename to tests/neg-macros/inline-case-objects/Macro_1.scala diff --git a/tests/neg/inline-case-objects/Main_2.scala b/tests/neg-macros/inline-case-objects/Main_2.scala similarity index 100% rename from tests/neg/inline-case-objects/Main_2.scala rename to tests/neg-macros/inline-case-objects/Main_2.scala diff --git a/tests/neg/inline-macro-staged-interpreter/Macro_1.scala b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala similarity index 100% rename from tests/neg/inline-macro-staged-interpreter/Macro_1.scala rename to tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala diff --git a/tests/neg/inline-macro-staged-interpreter/Main_2.scala b/tests/neg-macros/inline-macro-staged-interpreter/Main_2.scala similarity index 100% rename from tests/neg/inline-macro-staged-interpreter/Main_2.scala rename to tests/neg-macros/inline-macro-staged-interpreter/Main_2.scala diff --git a/tests/neg/inline-option/Macro_1.scala b/tests/neg-macros/inline-option/Macro_1.scala similarity index 100% rename from tests/neg/inline-option/Macro_1.scala rename to tests/neg-macros/inline-option/Macro_1.scala diff --git a/tests/neg/inline-option/Main_2.scala b/tests/neg-macros/inline-option/Main_2.scala similarity index 100% rename from tests/neg/inline-option/Main_2.scala rename to tests/neg-macros/inline-option/Main_2.scala diff --git a/tests/neg/inline-tuples-1/Macro_1.scala b/tests/neg-macros/inline-tuples-1/Macro_1.scala similarity index 100% rename from tests/neg/inline-tuples-1/Macro_1.scala rename to tests/neg-macros/inline-tuples-1/Macro_1.scala diff --git a/tests/neg/inline-tuples-1/Main_2.scala b/tests/neg-macros/inline-tuples-1/Main_2.scala similarity index 100% rename from tests/neg/inline-tuples-1/Main_2.scala rename to tests/neg-macros/inline-tuples-1/Main_2.scala diff --git a/tests/neg/quote-MacroOverride.scala b/tests/neg-macros/quote-MacroOverride.scala similarity index 100% rename from tests/neg/quote-MacroOverride.scala rename to tests/neg-macros/quote-MacroOverride.scala diff --git a/tests/neg/quote-complex-top-splice.scala b/tests/neg-macros/quote-complex-top-splice.scala similarity index 100% rename from tests/neg/quote-complex-top-splice.scala rename to tests/neg-macros/quote-complex-top-splice.scala diff --git a/tests/neg/quote-error-2/Macro_1.scala b/tests/neg-macros/quote-error-2/Macro_1.scala similarity index 100% rename from tests/neg/quote-error-2/Macro_1.scala rename to tests/neg-macros/quote-error-2/Macro_1.scala diff --git a/tests/neg/quote-error-2/Test_2.scala b/tests/neg-macros/quote-error-2/Test_2.scala similarity index 100% rename from tests/neg/quote-error-2/Test_2.scala rename to tests/neg-macros/quote-error-2/Test_2.scala diff --git a/tests/neg/quote-error/Macro_1.scala b/tests/neg-macros/quote-error/Macro_1.scala similarity index 100% rename from tests/neg/quote-error/Macro_1.scala rename to tests/neg-macros/quote-error/Macro_1.scala diff --git a/tests/neg/quote-error/Test_2.scala b/tests/neg-macros/quote-error/Test_2.scala similarity index 100% rename from tests/neg/quote-error/Test_2.scala rename to tests/neg-macros/quote-error/Test_2.scala diff --git a/tests/neg/quote-exception/Macro_1.scala b/tests/neg-macros/quote-exception/Macro_1.scala similarity index 100% rename from tests/neg/quote-exception/Macro_1.scala rename to tests/neg-macros/quote-exception/Macro_1.scala diff --git a/tests/neg/quote-exception/Test_2.scala b/tests/neg-macros/quote-exception/Test_2.scala similarity index 100% rename from tests/neg/quote-exception/Test_2.scala rename to tests/neg-macros/quote-exception/Test_2.scala diff --git a/tests/neg/quote-interpolator-core-old.scala b/tests/neg-macros/quote-interpolator-core-old.scala similarity index 100% rename from tests/neg/quote-interpolator-core-old.scala rename to tests/neg-macros/quote-interpolator-core-old.scala diff --git a/tests/neg/quote-macro-complex-arg-0.scala b/tests/neg-macros/quote-macro-complex-arg-0.scala similarity index 100% rename from tests/neg/quote-macro-complex-arg-0.scala rename to tests/neg-macros/quote-macro-complex-arg-0.scala diff --git a/tests/neg/quote-macro-splice.scala b/tests/neg-macros/quote-macro-splice.scala similarity index 100% rename from tests/neg/quote-macro-splice.scala rename to tests/neg-macros/quote-macro-splice.scala diff --git a/tests/neg/quote-pcp-in-arg.scala b/tests/neg-macros/quote-pcp-in-arg.scala similarity index 100% rename from tests/neg/quote-pcp-in-arg.scala rename to tests/neg-macros/quote-pcp-in-arg.scala diff --git a/tests/neg/quote-splice-interpret-1.scala b/tests/neg-macros/quote-splice-interpret-1.scala similarity index 100% rename from tests/neg/quote-splice-interpret-1.scala rename to tests/neg-macros/quote-splice-interpret-1.scala diff --git a/tests/neg/quote-this-b.scala b/tests/neg-macros/quote-this-b.scala similarity index 100% rename from tests/neg/quote-this-b.scala rename to tests/neg-macros/quote-this-b.scala diff --git a/tests/neg/quote-this.scala b/tests/neg-macros/quote-this.scala similarity index 100% rename from tests/neg/quote-this.scala rename to tests/neg-macros/quote-this.scala diff --git a/tests/neg/quote-whitebox/Macro_1.scala b/tests/neg-macros/quote-whitebox/Macro_1.scala similarity index 100% rename from tests/neg/quote-whitebox/Macro_1.scala rename to tests/neg-macros/quote-whitebox/Macro_1.scala diff --git a/tests/neg/quote-whitebox/Test_2.scala b/tests/neg-macros/quote-whitebox/Test_2.scala similarity index 100% rename from tests/neg/quote-whitebox/Test_2.scala rename to tests/neg-macros/quote-whitebox/Test_2.scala diff --git a/tests/neg/splice-in-top-level-splice-1.scala b/tests/neg-macros/splice-in-top-level-splice-1.scala similarity index 100% rename from tests/neg/splice-in-top-level-splice-1.scala rename to tests/neg-macros/splice-in-top-level-splice-1.scala diff --git a/tests/neg/splice-in-top-level-splice-2.scala b/tests/neg-macros/splice-in-top-level-splice-2.scala similarity index 100% rename from tests/neg/splice-in-top-level-splice-2.scala rename to tests/neg-macros/splice-in-top-level-splice-2.scala diff --git a/tests/neg/tasty-macro-assert-1/quoted_1.scala b/tests/neg-macros/tasty-macro-assert-1/quoted_1.scala similarity index 100% rename from tests/neg/tasty-macro-assert-1/quoted_1.scala rename to tests/neg-macros/tasty-macro-assert-1/quoted_1.scala diff --git a/tests/neg/tasty-macro-assert-1/quoted_2.scala b/tests/neg-macros/tasty-macro-assert-1/quoted_2.scala similarity index 100% rename from tests/neg/tasty-macro-assert-1/quoted_2.scala rename to tests/neg-macros/tasty-macro-assert-1/quoted_2.scala diff --git a/tests/neg/tasty-macro-assert-2/quoted_1.scala b/tests/neg-macros/tasty-macro-assert-2/quoted_1.scala similarity index 100% rename from tests/neg/tasty-macro-assert-2/quoted_1.scala rename to tests/neg-macros/tasty-macro-assert-2/quoted_1.scala diff --git a/tests/neg/tasty-macro-assert-2/quoted_2.scala b/tests/neg-macros/tasty-macro-assert-2/quoted_2.scala similarity index 100% rename from tests/neg/tasty-macro-assert-2/quoted_2.scala rename to tests/neg-macros/tasty-macro-assert-2/quoted_2.scala diff --git a/tests/neg/tasty-macro-error/quoted_1.scala b/tests/neg-macros/tasty-macro-error/quoted_1.scala similarity index 100% rename from tests/neg/tasty-macro-error/quoted_1.scala rename to tests/neg-macros/tasty-macro-error/quoted_1.scala diff --git a/tests/neg/tasty-macro-error/quoted_2.scala b/tests/neg-macros/tasty-macro-error/quoted_2.scala similarity index 100% rename from tests/neg/tasty-macro-error/quoted_2.scala rename to tests/neg-macros/tasty-macro-error/quoted_2.scala diff --git a/tests/neg/tasty-macro-positions/quoted_1.scala b/tests/neg-macros/tasty-macro-positions/quoted_1.scala similarity index 100% rename from tests/neg/tasty-macro-positions/quoted_1.scala rename to tests/neg-macros/tasty-macro-positions/quoted_1.scala diff --git a/tests/neg/tasty-macro-positions/quoted_2.scala b/tests/neg-macros/tasty-macro-positions/quoted_2.scala similarity index 100% rename from tests/neg/tasty-macro-positions/quoted_2.scala rename to tests/neg-macros/tasty-macro-positions/quoted_2.scala diff --git a/tests/neg/tasty-string-interpolator-position-a/Macro_1.scala b/tests/neg-macros/tasty-string-interpolator-position-a/Macro_1.scala similarity index 100% rename from tests/neg/tasty-string-interpolator-position-a/Macro_1.scala rename to tests/neg-macros/tasty-string-interpolator-position-a/Macro_1.scala diff --git a/tests/neg/tasty-string-interpolator-position-a/Test_2.scala b/tests/neg-macros/tasty-string-interpolator-position-a/Test_2.scala similarity index 100% rename from tests/neg/tasty-string-interpolator-position-a/Test_2.scala rename to tests/neg-macros/tasty-string-interpolator-position-a/Test_2.scala diff --git a/tests/neg/tasty-string-interpolator-position-b/Macro_1.scala b/tests/neg-macros/tasty-string-interpolator-position-b/Macro_1.scala similarity index 100% rename from tests/neg/tasty-string-interpolator-position-b/Macro_1.scala rename to tests/neg-macros/tasty-string-interpolator-position-b/Macro_1.scala diff --git a/tests/neg/tasty-string-interpolator-position-b/Test_2.scala b/tests/neg-macros/tasty-string-interpolator-position-b/Test_2.scala similarity index 100% rename from tests/neg/tasty-string-interpolator-position-b/Test_2.scala rename to tests/neg-macros/tasty-string-interpolator-position-b/Test_2.scala diff --git a/tests/pos/i3898/quoted_1.scala b/tests/pos-macros/i3898/quoted_1.scala similarity index 100% rename from tests/pos/i3898/quoted_1.scala rename to tests/pos-macros/i3898/quoted_1.scala diff --git a/tests/pos/i3898/quoted_2.scala b/tests/pos-macros/i3898/quoted_2.scala similarity index 100% rename from tests/pos/i3898/quoted_2.scala rename to tests/pos-macros/i3898/quoted_2.scala diff --git a/tests/pos/i3898b/quoted_1.scala b/tests/pos-macros/i3898b/quoted_1.scala similarity index 100% rename from tests/pos/i3898b/quoted_1.scala rename to tests/pos-macros/i3898b/quoted_1.scala diff --git a/tests/pos/i3898b/quoted_2.scala b/tests/pos-macros/i3898b/quoted_2.scala similarity index 100% rename from tests/pos/i3898b/quoted_2.scala rename to tests/pos-macros/i3898b/quoted_2.scala diff --git a/tests/pos/i3898c/quoted_1.scala b/tests/pos-macros/i3898c/quoted_1.scala similarity index 100% rename from tests/pos/i3898c/quoted_1.scala rename to tests/pos-macros/i3898c/quoted_1.scala diff --git a/tests/pos/i3898c/quoted_2.scala b/tests/pos-macros/i3898c/quoted_2.scala similarity index 100% rename from tests/pos/i3898c/quoted_2.scala rename to tests/pos-macros/i3898c/quoted_2.scala diff --git a/tests/pos/i3912-1/i3912_1.scala b/tests/pos-macros/i3912-1/i3912_1.scala similarity index 100% rename from tests/pos/i3912-1/i3912_1.scala rename to tests/pos-macros/i3912-1/i3912_1.scala diff --git a/tests/pos/i3912-1/i3912_2.scala b/tests/pos-macros/i3912-1/i3912_2.scala similarity index 100% rename from tests/pos/i3912-1/i3912_2.scala rename to tests/pos-macros/i3912-1/i3912_2.scala diff --git a/tests/pos/i3912-2/i3912_1.scala b/tests/pos-macros/i3912-2/i3912_1.scala similarity index 100% rename from tests/pos/i3912-2/i3912_1.scala rename to tests/pos-macros/i3912-2/i3912_1.scala diff --git a/tests/pos/i3912-2/i3912_2.scala b/tests/pos-macros/i3912-2/i3912_2.scala similarity index 100% rename from tests/pos/i3912-2/i3912_2.scala rename to tests/pos-macros/i3912-2/i3912_2.scala diff --git a/tests/pos/i4023/Macro_1.scala b/tests/pos-macros/i4023/Macro_1.scala similarity index 100% rename from tests/pos/i4023/Macro_1.scala rename to tests/pos-macros/i4023/Macro_1.scala diff --git a/tests/pos/i4023/Test_2.scala b/tests/pos-macros/i4023/Test_2.scala similarity index 100% rename from tests/pos/i4023/Test_2.scala rename to tests/pos-macros/i4023/Test_2.scala diff --git a/tests/pos/i4023b/Macro_1.scala b/tests/pos-macros/i4023b/Macro_1.scala similarity index 100% rename from tests/pos/i4023b/Macro_1.scala rename to tests/pos-macros/i4023b/Macro_1.scala diff --git a/tests/pos/i4023b/Test_2.scala b/tests/pos-macros/i4023b/Test_2.scala similarity index 100% rename from tests/pos/i4023b/Test_2.scala rename to tests/pos-macros/i4023b/Test_2.scala diff --git a/tests/pos/i4023c/Macro_1.scala b/tests/pos-macros/i4023c/Macro_1.scala similarity index 100% rename from tests/pos/i4023c/Macro_1.scala rename to tests/pos-macros/i4023c/Macro_1.scala diff --git a/tests/pos/i4023c/Test_2.scala b/tests/pos-macros/i4023c/Test_2.scala similarity index 100% rename from tests/pos/i4023c/Test_2.scala rename to tests/pos-macros/i4023c/Test_2.scala diff --git a/tests/pos/i4734/Macro_1.scala b/tests/pos-macros/i4734/Macro_1.scala similarity index 100% rename from tests/pos/i4734/Macro_1.scala rename to tests/pos-macros/i4734/Macro_1.scala diff --git a/tests/pos/i4734/Test_2.scala b/tests/pos-macros/i4734/Test_2.scala similarity index 100% rename from tests/pos/i4734/Test_2.scala rename to tests/pos-macros/i4734/Test_2.scala diff --git a/tests/pos/i6171/Macro_1.scala b/tests/pos-macros/i6171/Macro_1.scala similarity index 100% rename from tests/pos/i6171/Macro_1.scala rename to tests/pos-macros/i6171/Macro_1.scala diff --git a/tests/pos/i6171/Test_2.scala b/tests/pos-macros/i6171/Test_2.scala similarity index 100% rename from tests/pos/i6171/Test_2.scala rename to tests/pos-macros/i6171/Test_2.scala diff --git a/tests/pos/i6210/Macros_1.scala b/tests/pos-macros/i6210/Macros_1.scala similarity index 100% rename from tests/pos/i6210/Macros_1.scala rename to tests/pos-macros/i6210/Macros_1.scala diff --git a/tests/pos/i6210/Test_2.scala b/tests/pos-macros/i6210/Test_2.scala similarity index 100% rename from tests/pos/i6210/Test_2.scala rename to tests/pos-macros/i6210/Test_2.scala diff --git a/tests/pos/macro-with-array/Macro_1.scala b/tests/pos-macros/macro-with-array/Macro_1.scala similarity index 100% rename from tests/pos/macro-with-array/Macro_1.scala rename to tests/pos-macros/macro-with-array/Macro_1.scala diff --git a/tests/pos/macro-with-array/Test_2.scala b/tests/pos-macros/macro-with-array/Test_2.scala similarity index 100% rename from tests/pos/macro-with-array/Test_2.scala rename to tests/pos-macros/macro-with-array/Test_2.scala diff --git a/tests/pos/macro-with-type/Macro_1.scala b/tests/pos-macros/macro-with-type/Macro_1.scala similarity index 100% rename from tests/pos/macro-with-type/Macro_1.scala rename to tests/pos-macros/macro-with-type/Macro_1.scala diff --git a/tests/pos/macro-with-type/Test_2.scala b/tests/pos-macros/macro-with-type/Test_2.scala similarity index 100% rename from tests/pos/macro-with-type/Test_2.scala rename to tests/pos-macros/macro-with-type/Test_2.scala diff --git a/tests/pos/power-macro/Macro_1.scala b/tests/pos-macros/power-macro/Macro_1.scala similarity index 100% rename from tests/pos/power-macro/Macro_1.scala rename to tests/pos-macros/power-macro/Macro_1.scala diff --git a/tests/pos/power-macro/PowerInlined-1_2.scala b/tests/pos-macros/power-macro/PowerInlined-1_2.scala similarity index 100% rename from tests/pos/power-macro/PowerInlined-1_2.scala rename to tests/pos-macros/power-macro/PowerInlined-1_2.scala diff --git a/tests/pos/power-macro/PowerInlined-1k_2.scala b/tests/pos-macros/power-macro/PowerInlined-1k_2.scala similarity index 100% rename from tests/pos/power-macro/PowerInlined-1k_2.scala rename to tests/pos-macros/power-macro/PowerInlined-1k_2.scala diff --git a/tests/pos/quote-lift-inline-params/App_2.scala b/tests/pos-macros/quote-lift-inline-params/App_2.scala similarity index 100% rename from tests/pos/quote-lift-inline-params/App_2.scala rename to tests/pos-macros/quote-lift-inline-params/App_2.scala diff --git a/tests/pos/quote-lift-inline-params/Macro_1.scala b/tests/pos-macros/quote-lift-inline-params/Macro_1.scala similarity index 100% rename from tests/pos/quote-lift-inline-params/Macro_1.scala rename to tests/pos-macros/quote-lift-inline-params/Macro_1.scala diff --git a/tests/pos/quote-nested-object/Macro_1.scala b/tests/pos-macros/quote-nested-object/Macro_1.scala similarity index 100% rename from tests/pos/quote-nested-object/Macro_1.scala rename to tests/pos-macros/quote-nested-object/Macro_1.scala diff --git a/tests/pos/quote-nested-object/Test_2.scala b/tests/pos-macros/quote-nested-object/Test_2.scala similarity index 100% rename from tests/pos/quote-nested-object/Test_2.scala rename to tests/pos-macros/quote-nested-object/Test_2.scala diff --git a/tests/pos/quote-whitebox-2/Macro_1.scala b/tests/pos-macros/quote-whitebox-2/Macro_1.scala similarity index 100% rename from tests/pos/quote-whitebox-2/Macro_1.scala rename to tests/pos-macros/quote-whitebox-2/Macro_1.scala diff --git a/tests/pos/quote-whitebox-2/Test_2.scala b/tests/pos-macros/quote-whitebox-2/Test_2.scala similarity index 100% rename from tests/pos/quote-whitebox-2/Test_2.scala rename to tests/pos-macros/quote-whitebox-2/Test_2.scala diff --git a/tests/pos/tasty-constant-type/Macro_1.scala b/tests/pos-macros/tasty-constant-type/Macro_1.scala similarity index 100% rename from tests/pos/tasty-constant-type/Macro_1.scala rename to tests/pos-macros/tasty-constant-type/Macro_1.scala diff --git a/tests/pos/tasty-constant-type/Test_2.scala b/tests/pos-macros/tasty-constant-type/Test_2.scala similarity index 100% rename from tests/pos/tasty-constant-type/Test_2.scala rename to tests/pos-macros/tasty-constant-type/Test_2.scala diff --git a/tests/run/f-interpolation-1/FQuote_1.scala b/tests/run-macros/f-interpolation-1/FQuote_1.scala similarity index 100% rename from tests/run/f-interpolation-1/FQuote_1.scala rename to tests/run-macros/f-interpolation-1/FQuote_1.scala diff --git a/tests/run/f-interpolation-1/Test_2.scala b/tests/run-macros/f-interpolation-1/Test_2.scala similarity index 100% rename from tests/run/f-interpolation-1/Test_2.scala rename to tests/run-macros/f-interpolation-1/Test_2.scala diff --git a/tests/run/gestalt-optional-staging/Macro_1.scala b/tests/run-macros/gestalt-optional-staging/Macro_1.scala similarity index 100% rename from tests/run/gestalt-optional-staging/Macro_1.scala rename to tests/run-macros/gestalt-optional-staging/Macro_1.scala diff --git a/tests/run/gestalt-optional-staging/Test_2.scala b/tests/run-macros/gestalt-optional-staging/Test_2.scala similarity index 100% rename from tests/run/gestalt-optional-staging/Test_2.scala rename to tests/run-macros/gestalt-optional-staging/Test_2.scala diff --git a/tests/run/gestalt-type-toolbox-reflect/Macro_1.scala b/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala similarity index 100% rename from tests/run/gestalt-type-toolbox-reflect/Macro_1.scala rename to tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala diff --git a/tests/run/gestalt-type-toolbox-reflect/Test_2.scala b/tests/run-macros/gestalt-type-toolbox-reflect/Test_2.scala similarity index 100% rename from tests/run/gestalt-type-toolbox-reflect/Test_2.scala rename to tests/run-macros/gestalt-type-toolbox-reflect/Test_2.scala diff --git a/tests/run/i4431.check b/tests/run-macros/i4431.check similarity index 100% rename from tests/run/i4431.check rename to tests/run-macros/i4431.check diff --git a/tests/run/i4431/quoted_1.scala b/tests/run-macros/i4431/quoted_1.scala similarity index 100% rename from tests/run/i4431/quoted_1.scala rename to tests/run-macros/i4431/quoted_1.scala diff --git a/tests/run/i4431/quoted_2.scala b/tests/run-macros/i4431/quoted_2.scala similarity index 100% rename from tests/run/i4431/quoted_2.scala rename to tests/run-macros/i4431/quoted_2.scala diff --git a/tests/run/i4455.check b/tests/run-macros/i4455.check similarity index 100% rename from tests/run/i4455.check rename to tests/run-macros/i4455.check diff --git a/tests/run/i4455/Macro_1.scala b/tests/run-macros/i4455/Macro_1.scala similarity index 100% rename from tests/run/i4455/Macro_1.scala rename to tests/run-macros/i4455/Macro_1.scala diff --git a/tests/run/i4455/Test_2.scala b/tests/run-macros/i4455/Test_2.scala similarity index 100% rename from tests/run/i4455/Test_2.scala rename to tests/run-macros/i4455/Test_2.scala diff --git a/tests/run/i4492.check b/tests/run-macros/i4492.check similarity index 100% rename from tests/run/i4492.check rename to tests/run-macros/i4492.check diff --git a/tests/run/i4492/quoted_1.scala b/tests/run-macros/i4492/quoted_1.scala similarity index 100% rename from tests/run/i4492/quoted_1.scala rename to tests/run-macros/i4492/quoted_1.scala diff --git a/tests/run/i4492/quoted_2.scala b/tests/run-macros/i4492/quoted_2.scala similarity index 100% rename from tests/run/i4492/quoted_2.scala rename to tests/run-macros/i4492/quoted_2.scala diff --git a/tests/run/i4515/Macro_1.scala b/tests/run-macros/i4515/Macro_1.scala similarity index 100% rename from tests/run/i4515/Macro_1.scala rename to tests/run-macros/i4515/Macro_1.scala diff --git a/tests/run/i4515/Test_2.scala b/tests/run-macros/i4515/Test_2.scala similarity index 100% rename from tests/run/i4515/Test_2.scala rename to tests/run-macros/i4515/Test_2.scala diff --git a/tests/run/i4515b/Macro_1.scala b/tests/run-macros/i4515b/Macro_1.scala similarity index 100% rename from tests/run/i4515b/Macro_1.scala rename to tests/run-macros/i4515b/Macro_1.scala diff --git a/tests/run/i4515b/Test_2.scala b/tests/run-macros/i4515b/Test_2.scala similarity index 100% rename from tests/run/i4515b/Test_2.scala rename to tests/run-macros/i4515b/Test_2.scala diff --git a/tests/run/i4734.check b/tests/run-macros/i4734.check similarity index 100% rename from tests/run/i4734.check rename to tests/run-macros/i4734.check diff --git a/tests/run/i4734/Macro_1.scala b/tests/run-macros/i4734/Macro_1.scala similarity index 100% rename from tests/run/i4734/Macro_1.scala rename to tests/run-macros/i4734/Macro_1.scala diff --git a/tests/run/i4734/Test_2.scala b/tests/run-macros/i4734/Test_2.scala similarity index 100% rename from tests/run/i4734/Test_2.scala rename to tests/run-macros/i4734/Test_2.scala diff --git a/tests/run/i4735.check b/tests/run-macros/i4735.check similarity index 100% rename from tests/run/i4735.check rename to tests/run-macros/i4735.check diff --git a/tests/run/i4735/App_2.scala b/tests/run-macros/i4735/App_2.scala similarity index 100% rename from tests/run/i4735/App_2.scala rename to tests/run-macros/i4735/App_2.scala diff --git a/tests/run/i4735/Macro_1.scala b/tests/run-macros/i4735/Macro_1.scala similarity index 100% rename from tests/run/i4735/Macro_1.scala rename to tests/run-macros/i4735/Macro_1.scala diff --git a/tests/run/i4803.check b/tests/run-macros/i4803.check similarity index 100% rename from tests/run/i4803.check rename to tests/run-macros/i4803.check diff --git a/tests/run/i4803/App_2.scala b/tests/run-macros/i4803/App_2.scala similarity index 100% rename from tests/run/i4803/App_2.scala rename to tests/run-macros/i4803/App_2.scala diff --git a/tests/run/i4803/Macro_1.scala b/tests/run-macros/i4803/Macro_1.scala similarity index 100% rename from tests/run/i4803/Macro_1.scala rename to tests/run-macros/i4803/Macro_1.scala diff --git a/tests/run/i4803b.check b/tests/run-macros/i4803b.check similarity index 100% rename from tests/run/i4803b.check rename to tests/run-macros/i4803b.check diff --git a/tests/run/i4803b/App_2.scala b/tests/run-macros/i4803b/App_2.scala similarity index 100% rename from tests/run/i4803b/App_2.scala rename to tests/run-macros/i4803b/App_2.scala diff --git a/tests/run/i4803b/Macro_1.scala b/tests/run-macros/i4803b/Macro_1.scala similarity index 100% rename from tests/run/i4803b/Macro_1.scala rename to tests/run-macros/i4803b/Macro_1.scala diff --git a/tests/run/i4803c.check b/tests/run-macros/i4803c.check similarity index 100% rename from tests/run/i4803c.check rename to tests/run-macros/i4803c.check diff --git a/tests/run/i4803c/App_2.scala b/tests/run-macros/i4803c/App_2.scala similarity index 100% rename from tests/run/i4803c/App_2.scala rename to tests/run-macros/i4803c/App_2.scala diff --git a/tests/run/i4803c/Macro_1.scala b/tests/run-macros/i4803c/Macro_1.scala similarity index 100% rename from tests/run/i4803c/Macro_1.scala rename to tests/run-macros/i4803c/Macro_1.scala diff --git a/tests/run/i4803e/App_2.scala b/tests/run-macros/i4803e/App_2.scala similarity index 100% rename from tests/run/i4803e/App_2.scala rename to tests/run-macros/i4803e/App_2.scala diff --git a/tests/run/i4803e/Macro_1.scala b/tests/run-macros/i4803e/Macro_1.scala similarity index 100% rename from tests/run/i4803e/Macro_1.scala rename to tests/run-macros/i4803e/Macro_1.scala diff --git a/tests/run/i4803f/App_2.scala b/tests/run-macros/i4803f/App_2.scala similarity index 100% rename from tests/run/i4803f/App_2.scala rename to tests/run-macros/i4803f/App_2.scala diff --git a/tests/run/i4803f/Macro_1.scala b/tests/run-macros/i4803f/Macro_1.scala similarity index 100% rename from tests/run/i4803f/Macro_1.scala rename to tests/run-macros/i4803f/Macro_1.scala diff --git a/tests/run/i4947e.check b/tests/run-macros/i4947e.check similarity index 100% rename from tests/run/i4947e.check rename to tests/run-macros/i4947e.check diff --git a/tests/run/i4947e/Macro_1.scala b/tests/run-macros/i4947e/Macro_1.scala similarity index 100% rename from tests/run/i4947e/Macro_1.scala rename to tests/run-macros/i4947e/Macro_1.scala diff --git a/tests/run/i4947e/Test_2.scala b/tests/run-macros/i4947e/Test_2.scala similarity index 100% rename from tests/run/i4947e/Test_2.scala rename to tests/run-macros/i4947e/Test_2.scala diff --git a/tests/run/i4947f.check b/tests/run-macros/i4947f.check similarity index 100% rename from tests/run/i4947f.check rename to tests/run-macros/i4947f.check diff --git a/tests/run/i4947f/Macro_1.scala b/tests/run-macros/i4947f/Macro_1.scala similarity index 100% rename from tests/run/i4947f/Macro_1.scala rename to tests/run-macros/i4947f/Macro_1.scala diff --git a/tests/run/i4947f/Test_2.scala b/tests/run-macros/i4947f/Test_2.scala similarity index 100% rename from tests/run/i4947f/Test_2.scala rename to tests/run-macros/i4947f/Test_2.scala diff --git a/tests/run/i5119.check b/tests/run-macros/i5119.check similarity index 100% rename from tests/run/i5119.check rename to tests/run-macros/i5119.check diff --git a/tests/run/i5119/Macro_1.scala b/tests/run-macros/i5119/Macro_1.scala similarity index 100% rename from tests/run/i5119/Macro_1.scala rename to tests/run-macros/i5119/Macro_1.scala diff --git a/tests/run/i5119/Main_2.scala b/tests/run-macros/i5119/Main_2.scala similarity index 100% rename from tests/run/i5119/Main_2.scala rename to tests/run-macros/i5119/Main_2.scala diff --git a/tests/run/i5119b.check b/tests/run-macros/i5119b.check similarity index 100% rename from tests/run/i5119b.check rename to tests/run-macros/i5119b.check diff --git a/tests/run/i5119b/Macro_1.scala b/tests/run-macros/i5119b/Macro_1.scala similarity index 100% rename from tests/run/i5119b/Macro_1.scala rename to tests/run-macros/i5119b/Macro_1.scala diff --git a/tests/run/i5119b/Main_2.scala b/tests/run-macros/i5119b/Main_2.scala similarity index 100% rename from tests/run/i5119b/Main_2.scala rename to tests/run-macros/i5119b/Main_2.scala diff --git a/tests/run/i5188a.check b/tests/run-macros/i5188a.check similarity index 100% rename from tests/run/i5188a.check rename to tests/run-macros/i5188a.check diff --git a/tests/run/i5188a/Macro_1.scala b/tests/run-macros/i5188a/Macro_1.scala similarity index 100% rename from tests/run/i5188a/Macro_1.scala rename to tests/run-macros/i5188a/Macro_1.scala diff --git a/tests/run/i5188a/Test_2.scala b/tests/run-macros/i5188a/Test_2.scala similarity index 100% rename from tests/run/i5188a/Test_2.scala rename to tests/run-macros/i5188a/Test_2.scala diff --git a/tests/run/i5533.check b/tests/run-macros/i5533.check similarity index 100% rename from tests/run/i5533.check rename to tests/run-macros/i5533.check diff --git a/tests/run/i5533/Macro_1.scala b/tests/run-macros/i5533/Macro_1.scala similarity index 100% rename from tests/run/i5533/Macro_1.scala rename to tests/run-macros/i5533/Macro_1.scala diff --git a/tests/run/i5533/Test_2.scala b/tests/run-macros/i5533/Test_2.scala similarity index 100% rename from tests/run/i5533/Test_2.scala rename to tests/run-macros/i5533/Test_2.scala diff --git a/tests/run/i5533b.check b/tests/run-macros/i5533b.check similarity index 100% rename from tests/run/i5533b.check rename to tests/run-macros/i5533b.check diff --git a/tests/run/i5533b/Macro_1.scala b/tests/run-macros/i5533b/Macro_1.scala similarity index 88% rename from tests/run/i5533b/Macro_1.scala rename to tests/run-macros/i5533b/Macro_1.scala index c69192218c7e..f57626b258a0 100644 --- a/tests/run/i5533b/Macro_1.scala +++ b/tests/run-macros/i5533b/Macro_1.scala @@ -8,7 +8,6 @@ object scalatest { inline def assert(condition: => Boolean): Unit = ${assertImpl('condition)} def assertImpl(condition: Expr[Boolean])(implicit refl: Reflection): Expr[Unit] = { - implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(this.getClass.getClassLoader) import refl._ val tree = condition.unseal def exprStr: String = condition.show @@ -30,4 +29,4 @@ object scalatest { } } } -} \ No newline at end of file +} diff --git a/tests/run/i5533b/Test_2.scala b/tests/run-macros/i5533b/Test_2.scala similarity index 100% rename from tests/run/i5533b/Test_2.scala rename to tests/run-macros/i5533b/Test_2.scala diff --git a/tests/run/i5536/Macro_1.scala b/tests/run-macros/i5536/Macro_1.scala similarity index 87% rename from tests/run/i5536/Macro_1.scala rename to tests/run-macros/i5536/Macro_1.scala index 45c27c56d642..b3f280c14117 100644 --- a/tests/run/i5536/Macro_1.scala +++ b/tests/run-macros/i5536/Macro_1.scala @@ -6,7 +6,6 @@ object scalatest { def assertImpl(condition: Expr[Boolean])(implicit refl: Reflection): Expr[Unit] = { import refl._ - implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(this.getClass.getClassLoader) val tree = condition.unseal def exprStr: String = condition.show diff --git a/tests/run/i5536/Test_2.scala b/tests/run-macros/i5536/Test_2.scala similarity index 100% rename from tests/run/i5536/Test_2.scala rename to tests/run-macros/i5536/Test_2.scala diff --git a/tests/run/i5629/Macro_1.scala b/tests/run-macros/i5629/Macro_1.scala similarity index 100% rename from tests/run/i5629/Macro_1.scala rename to tests/run-macros/i5629/Macro_1.scala diff --git a/tests/run/i5629/Test_2.scala b/tests/run-macros/i5629/Test_2.scala similarity index 100% rename from tests/run/i5629/Test_2.scala rename to tests/run-macros/i5629/Test_2.scala diff --git a/tests/run-with-compiler/i5715/Macro_1.scala b/tests/run-macros/i5715/Macro_1.scala similarity index 100% rename from tests/run-with-compiler/i5715/Macro_1.scala rename to tests/run-macros/i5715/Macro_1.scala diff --git a/tests/run-with-compiler/i5715/Test_2.scala b/tests/run-macros/i5715/Test_2.scala similarity index 100% rename from tests/run-with-compiler/i5715/Test_2.scala rename to tests/run-macros/i5715/Test_2.scala diff --git a/tests/run-with-compiler/i5941/macro_1.scala b/tests/run-macros/i5941/macro_1.scala similarity index 100% rename from tests/run-with-compiler/i5941/macro_1.scala rename to tests/run-macros/i5941/macro_1.scala diff --git a/tests/run-with-compiler/i5941/usage_2.scala b/tests/run-macros/i5941/usage_2.scala similarity index 100% rename from tests/run-with-compiler/i5941/usage_2.scala rename to tests/run-macros/i5941/usage_2.scala diff --git a/tests/run-with-compiler/i6171/Macro_1.scala b/tests/run-macros/i6171/Macro_1.scala similarity index 100% rename from tests/run-with-compiler/i6171/Macro_1.scala rename to tests/run-macros/i6171/Macro_1.scala diff --git a/tests/run-with-compiler/i6171/Test_2.scala b/tests/run-macros/i6171/Test_2.scala similarity index 100% rename from tests/run-with-compiler/i6171/Test_2.scala rename to tests/run-macros/i6171/Test_2.scala diff --git a/tests/run-with-compiler/i6253-b.check b/tests/run-macros/i6253-b.check similarity index 100% rename from tests/run-with-compiler/i6253-b.check rename to tests/run-macros/i6253-b.check diff --git a/tests/run-with-compiler/i6253-b/quoted_1.scala b/tests/run-macros/i6253-b/quoted_1.scala similarity index 100% rename from tests/run-with-compiler/i6253-b/quoted_1.scala rename to tests/run-macros/i6253-b/quoted_1.scala diff --git a/tests/run-with-compiler/i6253-b/quoted_2.scala b/tests/run-macros/i6253-b/quoted_2.scala similarity index 100% rename from tests/run-with-compiler/i6253-b/quoted_2.scala rename to tests/run-macros/i6253-b/quoted_2.scala diff --git a/tests/run-with-compiler/i6253.check b/tests/run-macros/i6253.check similarity index 100% rename from tests/run-with-compiler/i6253.check rename to tests/run-macros/i6253.check diff --git a/tests/run-with-compiler/i6253/quoted_1.scala b/tests/run-macros/i6253/quoted_1.scala similarity index 100% rename from tests/run-with-compiler/i6253/quoted_1.scala rename to tests/run-macros/i6253/quoted_1.scala diff --git a/tests/run-with-compiler/i6253/quoted_2.scala b/tests/run-macros/i6253/quoted_2.scala similarity index 100% rename from tests/run-with-compiler/i6253/quoted_2.scala rename to tests/run-macros/i6253/quoted_2.scala diff --git a/tests/run/inferred-repeated-result.check b/tests/run-macros/inferred-repeated-result.check similarity index 100% rename from tests/run/inferred-repeated-result.check rename to tests/run-macros/inferred-repeated-result.check diff --git a/tests/run/inferred-repeated-result/test_1.scala b/tests/run-macros/inferred-repeated-result/test_1.scala similarity index 100% rename from tests/run/inferred-repeated-result/test_1.scala rename to tests/run-macros/inferred-repeated-result/test_1.scala diff --git a/tests/run/inferred-repeated-result/test_2.scala b/tests/run-macros/inferred-repeated-result/test_2.scala similarity index 100% rename from tests/run/inferred-repeated-result/test_2.scala rename to tests/run-macros/inferred-repeated-result/test_2.scala diff --git a/tests/run/inline-case-objects.check b/tests/run-macros/inline-case-objects.check similarity index 100% rename from tests/run/inline-case-objects.check rename to tests/run-macros/inline-case-objects.check diff --git a/tests/run/inline-case-objects/Macro_1.scala b/tests/run-macros/inline-case-objects/Macro_1.scala similarity index 100% rename from tests/run/inline-case-objects/Macro_1.scala rename to tests/run-macros/inline-case-objects/Macro_1.scala diff --git a/tests/run/inline-case-objects/Main_2.scala b/tests/run-macros/inline-case-objects/Main_2.scala similarity index 100% rename from tests/run/inline-case-objects/Main_2.scala rename to tests/run-macros/inline-case-objects/Main_2.scala diff --git a/tests/run/inline-macro-staged-interpreter.check b/tests/run-macros/inline-macro-staged-interpreter.check similarity index 100% rename from tests/run/inline-macro-staged-interpreter.check rename to tests/run-macros/inline-macro-staged-interpreter.check diff --git a/tests/run/inline-macro-staged-interpreter/Macro_1.scala b/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala similarity index 100% rename from tests/run/inline-macro-staged-interpreter/Macro_1.scala rename to tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala diff --git a/tests/run/inline-macro-staged-interpreter/Main_2.scala b/tests/run-macros/inline-macro-staged-interpreter/Main_2.scala similarity index 100% rename from tests/run/inline-macro-staged-interpreter/Main_2.scala rename to tests/run-macros/inline-macro-staged-interpreter/Main_2.scala diff --git a/tests/run/inline-option.check b/tests/run-macros/inline-option.check similarity index 100% rename from tests/run/inline-option.check rename to tests/run-macros/inline-option.check diff --git a/tests/run/inline-option/Macro_1.scala b/tests/run-macros/inline-option/Macro_1.scala similarity index 100% rename from tests/run/inline-option/Macro_1.scala rename to tests/run-macros/inline-option/Macro_1.scala diff --git a/tests/run/inline-option/Main_2.scala b/tests/run-macros/inline-option/Main_2.scala similarity index 100% rename from tests/run/inline-option/Main_2.scala rename to tests/run-macros/inline-option/Main_2.scala diff --git a/tests/run/inline-tuples-1.check b/tests/run-macros/inline-tuples-1.check similarity index 100% rename from tests/run/inline-tuples-1.check rename to tests/run-macros/inline-tuples-1.check diff --git a/tests/run/inline-tuples-1/Macro_1.scala b/tests/run-macros/inline-tuples-1/Macro_1.scala similarity index 100% rename from tests/run/inline-tuples-1/Macro_1.scala rename to tests/run-macros/inline-tuples-1/Macro_1.scala diff --git a/tests/run/inline-tuples-1/Main_2.scala b/tests/run-macros/inline-tuples-1/Main_2.scala similarity index 100% rename from tests/run/inline-tuples-1/Main_2.scala rename to tests/run-macros/inline-tuples-1/Main_2.scala diff --git a/tests/run/inline-tuples-2.check b/tests/run-macros/inline-tuples-2.check similarity index 100% rename from tests/run/inline-tuples-2.check rename to tests/run-macros/inline-tuples-2.check diff --git a/tests/run/inline-tuples-2/Macro_1.scala b/tests/run-macros/inline-tuples-2/Macro_1.scala similarity index 100% rename from tests/run/inline-tuples-2/Macro_1.scala rename to tests/run-macros/inline-tuples-2/Macro_1.scala diff --git a/tests/run/inline-tuples-2/Main_2.scala b/tests/run-macros/inline-tuples-2/Main_2.scala similarity index 100% rename from tests/run/inline-tuples-2/Main_2.scala rename to tests/run-macros/inline-tuples-2/Main_2.scala diff --git a/tests/run/inline-varargs-1.check b/tests/run-macros/inline-varargs-1.check similarity index 100% rename from tests/run/inline-varargs-1.check rename to tests/run-macros/inline-varargs-1.check diff --git a/tests/run/inline-varargs-1/Macro_1.scala b/tests/run-macros/inline-varargs-1/Macro_1.scala similarity index 100% rename from tests/run/inline-varargs-1/Macro_1.scala rename to tests/run-macros/inline-varargs-1/Macro_1.scala diff --git a/tests/run/inline-varargs-1/Main_2.scala b/tests/run-macros/inline-varargs-1/Main_2.scala similarity index 100% rename from tests/run/inline-varargs-1/Main_2.scala rename to tests/run-macros/inline-varargs-1/Main_2.scala diff --git a/tests/run/quote-and-splice.check b/tests/run-macros/quote-and-splice.check similarity index 100% rename from tests/run/quote-and-splice.check rename to tests/run-macros/quote-and-splice.check diff --git a/tests/run/quote-and-splice/Macros_1.scala b/tests/run-macros/quote-and-splice/Macros_1.scala similarity index 100% rename from tests/run/quote-and-splice/Macros_1.scala rename to tests/run-macros/quote-and-splice/Macros_1.scala diff --git a/tests/run/quote-and-splice/Test_2.scala b/tests/run-macros/quote-and-splice/Test_2.scala similarity index 100% rename from tests/run/quote-and-splice/Test_2.scala rename to tests/run-macros/quote-and-splice/Test_2.scala diff --git a/tests/run/quote-change-owner.check b/tests/run-macros/quote-change-owner.check similarity index 100% rename from tests/run/quote-change-owner.check rename to tests/run-macros/quote-change-owner.check diff --git a/tests/run/quote-change-owner/Macro_1.scala b/tests/run-macros/quote-change-owner/Macro_1.scala similarity index 100% rename from tests/run/quote-change-owner/Macro_1.scala rename to tests/run-macros/quote-change-owner/Macro_1.scala diff --git a/tests/run/quote-change-owner/Test_2.scala b/tests/run-macros/quote-change-owner/Test_2.scala similarity index 100% rename from tests/run/quote-change-owner/Test_2.scala rename to tests/run-macros/quote-change-owner/Test_2.scala diff --git a/tests/run/quote-elide-prefix/quoted_1.scala b/tests/run-macros/quote-elide-prefix/quoted_1.scala similarity index 100% rename from tests/run/quote-elide-prefix/quoted_1.scala rename to tests/run-macros/quote-elide-prefix/quoted_1.scala diff --git a/tests/run/quote-elide-prefix/quoted_2.scala b/tests/run-macros/quote-elide-prefix/quoted_2.scala similarity index 100% rename from tests/run/quote-elide-prefix/quoted_2.scala rename to tests/run-macros/quote-elide-prefix/quoted_2.scala diff --git a/tests/run/quote-force.check b/tests/run-macros/quote-force.check similarity index 100% rename from tests/run/quote-force.check rename to tests/run-macros/quote-force.check diff --git a/tests/run/quote-force/quoted_1.scala b/tests/run-macros/quote-force/quoted_1.scala similarity index 100% rename from tests/run/quote-force/quoted_1.scala rename to tests/run-macros/quote-force/quoted_1.scala diff --git a/tests/run/quote-force/quoted_2.scala b/tests/run-macros/quote-force/quoted_2.scala similarity index 100% rename from tests/run/quote-force/quoted_2.scala rename to tests/run-macros/quote-force/quoted_2.scala diff --git a/tests/run-with-compiler/quote-impure-by-name.check b/tests/run-macros/quote-impure-by-name.check similarity index 100% rename from tests/run-with-compiler/quote-impure-by-name.check rename to tests/run-macros/quote-impure-by-name.check diff --git a/tests/run-with-compiler/quote-impure-by-name/quoted_1.scala b/tests/run-macros/quote-impure-by-name/quoted_1.scala similarity index 100% rename from tests/run-with-compiler/quote-impure-by-name/quoted_1.scala rename to tests/run-macros/quote-impure-by-name/quoted_1.scala diff --git a/tests/run-with-compiler/quote-impure-by-name/quoted_2.scala b/tests/run-macros/quote-impure-by-name/quoted_2.scala similarity index 100% rename from tests/run-with-compiler/quote-impure-by-name/quoted_2.scala rename to tests/run-macros/quote-impure-by-name/quoted_2.scala diff --git a/tests/run/quote-indexed-map-by-name/quoted_1.scala b/tests/run-macros/quote-indexed-map-by-name/quoted_1.scala similarity index 100% rename from tests/run/quote-indexed-map-by-name/quoted_1.scala rename to tests/run-macros/quote-indexed-map-by-name/quoted_1.scala diff --git a/tests/run/quote-indexed-map-by-name/quoted_2.scala b/tests/run-macros/quote-indexed-map-by-name/quoted_2.scala similarity index 100% rename from tests/run/quote-indexed-map-by-name/quoted_2.scala rename to tests/run-macros/quote-indexed-map-by-name/quoted_2.scala diff --git a/tests/run-with-compiler/quote-inline-function.check b/tests/run-macros/quote-inline-function.check similarity index 100% rename from tests/run-with-compiler/quote-inline-function.check rename to tests/run-macros/quote-inline-function.check diff --git a/tests/run-with-compiler/quote-inline-function/quoted_1.scala b/tests/run-macros/quote-inline-function/quoted_1.scala similarity index 100% rename from tests/run-with-compiler/quote-inline-function/quoted_1.scala rename to tests/run-macros/quote-inline-function/quoted_1.scala diff --git a/tests/run-with-compiler/quote-inline-function/quoted_2.scala b/tests/run-macros/quote-inline-function/quoted_2.scala similarity index 100% rename from tests/run-with-compiler/quote-inline-function/quoted_2.scala rename to tests/run-macros/quote-inline-function/quoted_2.scala diff --git a/tests/run-with-compiler/quote-matcher-runtime.check b/tests/run-macros/quote-matcher-runtime.check similarity index 100% rename from tests/run-with-compiler/quote-matcher-runtime.check rename to tests/run-macros/quote-matcher-runtime.check diff --git a/tests/run-with-compiler/quote-matcher-runtime/quoted_1.scala b/tests/run-macros/quote-matcher-runtime/quoted_1.scala similarity index 100% rename from tests/run-with-compiler/quote-matcher-runtime/quoted_1.scala rename to tests/run-macros/quote-matcher-runtime/quoted_1.scala diff --git a/tests/run-with-compiler/quote-matcher-runtime/quoted_2.scala b/tests/run-macros/quote-matcher-runtime/quoted_2.scala similarity index 100% rename from tests/run-with-compiler/quote-matcher-runtime/quoted_2.scala rename to tests/run-macros/quote-matcher-runtime/quoted_2.scala diff --git a/tests/run-with-compiler/quote-matcher-string-interpolator-2.check b/tests/run-macros/quote-matcher-string-interpolator-2.check similarity index 100% rename from tests/run-with-compiler/quote-matcher-string-interpolator-2.check rename to tests/run-macros/quote-matcher-string-interpolator-2.check diff --git a/tests/run-with-compiler/quote-matcher-string-interpolator-2/quoted_1.scala b/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala similarity index 100% rename from tests/run-with-compiler/quote-matcher-string-interpolator-2/quoted_1.scala rename to tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala diff --git a/tests/run-with-compiler/quote-matcher-string-interpolator-2/quoted_2.scala b/tests/run-macros/quote-matcher-string-interpolator-2/quoted_2.scala similarity index 100% rename from tests/run-with-compiler/quote-matcher-string-interpolator-2/quoted_2.scala rename to tests/run-macros/quote-matcher-string-interpolator-2/quoted_2.scala diff --git a/tests/run-with-compiler/quote-matcher-string-interpolator.check b/tests/run-macros/quote-matcher-string-interpolator.check similarity index 100% rename from tests/run-with-compiler/quote-matcher-string-interpolator.check rename to tests/run-macros/quote-matcher-string-interpolator.check diff --git a/tests/run-with-compiler/quote-matcher-string-interpolator/quoted_1.scala b/tests/run-macros/quote-matcher-string-interpolator/quoted_1.scala similarity index 100% rename from tests/run-with-compiler/quote-matcher-string-interpolator/quoted_1.scala rename to tests/run-macros/quote-matcher-string-interpolator/quoted_1.scala diff --git a/tests/run-with-compiler/quote-matcher-string-interpolator/quoted_2.scala b/tests/run-macros/quote-matcher-string-interpolator/quoted_2.scala similarity index 100% rename from tests/run-with-compiler/quote-matcher-string-interpolator/quoted_2.scala rename to tests/run-macros/quote-matcher-string-interpolator/quoted_2.scala diff --git a/tests/run-with-compiler/quote-matcher-symantics-1.check b/tests/run-macros/quote-matcher-symantics-1.check similarity index 100% rename from tests/run-with-compiler/quote-matcher-symantics-1.check rename to tests/run-macros/quote-matcher-symantics-1.check diff --git a/tests/run-with-compiler/quote-matcher-symantics-1/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala similarity index 100% rename from tests/run-with-compiler/quote-matcher-symantics-1/quoted_1.scala rename to tests/run-macros/quote-matcher-symantics-1/quoted_1.scala diff --git a/tests/run-with-compiler/quote-matcher-symantics-1/quoted_2.scala b/tests/run-macros/quote-matcher-symantics-1/quoted_2.scala similarity index 100% rename from tests/run-with-compiler/quote-matcher-symantics-1/quoted_2.scala rename to tests/run-macros/quote-matcher-symantics-1/quoted_2.scala diff --git a/tests/run-with-compiler/quote-matcher-symantics-2.check b/tests/run-macros/quote-matcher-symantics-2.check similarity index 100% rename from tests/run-with-compiler/quote-matcher-symantics-2.check rename to tests/run-macros/quote-matcher-symantics-2.check diff --git a/tests/run-with-compiler/quote-matcher-symantics-2/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala similarity index 100% rename from tests/run-with-compiler/quote-matcher-symantics-2/quoted_1.scala rename to tests/run-macros/quote-matcher-symantics-2/quoted_1.scala diff --git a/tests/run-with-compiler/quote-matcher-symantics-2/quoted_2.scala b/tests/run-macros/quote-matcher-symantics-2/quoted_2.scala similarity index 100% rename from tests/run-with-compiler/quote-matcher-symantics-2/quoted_2.scala rename to tests/run-macros/quote-matcher-symantics-2/quoted_2.scala diff --git a/tests/run/quote-sep-comp-2/Macro_1.scala b/tests/run-macros/quote-sep-comp-2/Macro_1.scala similarity index 100% rename from tests/run/quote-sep-comp-2/Macro_1.scala rename to tests/run-macros/quote-sep-comp-2/Macro_1.scala diff --git a/tests/run/quote-sep-comp-2/Test_2.scala b/tests/run-macros/quote-sep-comp-2/Test_2.scala similarity index 100% rename from tests/run/quote-sep-comp-2/Test_2.scala rename to tests/run-macros/quote-sep-comp-2/Test_2.scala diff --git a/tests/run/quote-sep-comp.check b/tests/run-macros/quote-sep-comp.check similarity index 100% rename from tests/run/quote-sep-comp.check rename to tests/run-macros/quote-sep-comp.check diff --git a/tests/run/quote-sep-comp/Macro_1.scala b/tests/run-macros/quote-sep-comp/Macro_1.scala similarity index 100% rename from tests/run/quote-sep-comp/Macro_1.scala rename to tests/run-macros/quote-sep-comp/Macro_1.scala diff --git a/tests/run/quote-sep-comp/Test_2.scala b/tests/run-macros/quote-sep-comp/Test_2.scala similarity index 100% rename from tests/run/quote-sep-comp/Test_2.scala rename to tests/run-macros/quote-sep-comp/Test_2.scala diff --git a/tests/run/quote-simple-macro.check b/tests/run-macros/quote-simple-macro.check similarity index 100% rename from tests/run/quote-simple-macro.check rename to tests/run-macros/quote-simple-macro.check diff --git a/tests/run/quote-simple-macro/quoted_1.scala b/tests/run-macros/quote-simple-macro/quoted_1.scala similarity index 100% rename from tests/run/quote-simple-macro/quoted_1.scala rename to tests/run-macros/quote-simple-macro/quoted_1.scala diff --git a/tests/run/quote-simple-macro/quoted_2.scala b/tests/run-macros/quote-simple-macro/quoted_2.scala similarity index 100% rename from tests/run/quote-simple-macro/quoted_2.scala rename to tests/run-macros/quote-simple-macro/quoted_2.scala diff --git a/tests/run/quote-unrolled-foreach.check b/tests/run-macros/quote-unrolled-foreach.check similarity index 100% rename from tests/run/quote-unrolled-foreach.check rename to tests/run-macros/quote-unrolled-foreach.check diff --git a/tests/run/quote-unrolled-foreach/quoted_1.scala b/tests/run-macros/quote-unrolled-foreach/quoted_1.scala similarity index 100% rename from tests/run/quote-unrolled-foreach/quoted_1.scala rename to tests/run-macros/quote-unrolled-foreach/quoted_1.scala diff --git a/tests/run/quote-unrolled-foreach/quoted_2.scala b/tests/run-macros/quote-unrolled-foreach/quoted_2.scala similarity index 100% rename from tests/run/quote-unrolled-foreach/quoted_2.scala rename to tests/run-macros/quote-unrolled-foreach/quoted_2.scala diff --git a/tests/run/quote-whitebox.check b/tests/run-macros/quote-whitebox.check similarity index 100% rename from tests/run/quote-whitebox.check rename to tests/run-macros/quote-whitebox.check diff --git a/tests/run/quote-whitebox/Macro_1.scala b/tests/run-macros/quote-whitebox/Macro_1.scala similarity index 100% rename from tests/run/quote-whitebox/Macro_1.scala rename to tests/run-macros/quote-whitebox/Macro_1.scala diff --git a/tests/run/quote-whitebox/Test_2.scala b/tests/run-macros/quote-whitebox/Test_2.scala similarity index 100% rename from tests/run/quote-whitebox/Test_2.scala rename to tests/run-macros/quote-whitebox/Test_2.scala diff --git a/tests/run-with-compiler/reflect-select-constructor/assert_1.scala b/tests/run-macros/reflect-select-constructor/assert_1.scala similarity index 100% rename from tests/run-with-compiler/reflect-select-constructor/assert_1.scala rename to tests/run-macros/reflect-select-constructor/assert_1.scala diff --git a/tests/run-with-compiler/reflect-select-constructor/test_2.scala b/tests/run-macros/reflect-select-constructor/test_2.scala similarity index 100% rename from tests/run-with-compiler/reflect-select-constructor/test_2.scala rename to tests/run-macros/reflect-select-constructor/test_2.scala diff --git a/tests/run/reflect-select-copy/assert_1.scala b/tests/run-macros/reflect-select-copy/assert_1.scala similarity index 100% rename from tests/run/reflect-select-copy/assert_1.scala rename to tests/run-macros/reflect-select-copy/assert_1.scala diff --git a/tests/run-with-compiler/reflect-select-copy/assert_1.scala b/tests/run-macros/reflect-select-copy/reflect-select-copy/assert_1.scala similarity index 100% rename from tests/run-with-compiler/reflect-select-copy/assert_1.scala rename to tests/run-macros/reflect-select-copy/reflect-select-copy/assert_1.scala diff --git a/tests/run-with-compiler/reflect-select-copy/test_2.scala b/tests/run-macros/reflect-select-copy/reflect-select-copy/test_2.scala similarity index 100% rename from tests/run-with-compiler/reflect-select-copy/test_2.scala rename to tests/run-macros/reflect-select-copy/reflect-select-copy/test_2.scala diff --git a/tests/run/reflect-select-copy/test_2.scala b/tests/run-macros/reflect-select-copy/test_2.scala similarity index 100% rename from tests/run/reflect-select-copy/test_2.scala rename to tests/run-macros/reflect-select-copy/test_2.scala diff --git a/tests/run-with-compiler/reflect-select-value-class/assert_1.scala b/tests/run-macros/reflect-select-value-class/assert_1.scala similarity index 100% rename from tests/run-with-compiler/reflect-select-value-class/assert_1.scala rename to tests/run-macros/reflect-select-value-class/assert_1.scala diff --git a/tests/run-with-compiler/reflect-select-value-class/test_2.scala b/tests/run-macros/reflect-select-value-class/test_2.scala similarity index 100% rename from tests/run-with-compiler/reflect-select-value-class/test_2.scala rename to tests/run-macros/reflect-select-value-class/test_2.scala diff --git a/tests/run-with-compiler/reflect-typeChecks/assert_1.scala b/tests/run-macros/reflect-typeChecks/assert_1.scala similarity index 100% rename from tests/run-with-compiler/reflect-typeChecks/assert_1.scala rename to tests/run-macros/reflect-typeChecks/assert_1.scala diff --git a/tests/run-with-compiler/reflect-typeChecks/test_2.scala b/tests/run-macros/reflect-typeChecks/test_2.scala similarity index 100% rename from tests/run-with-compiler/reflect-typeChecks/test_2.scala rename to tests/run-macros/reflect-typeChecks/test_2.scala diff --git a/tests/run/tasty-argument-tree-1.check b/tests/run-macros/tasty-argument-tree-1.check similarity index 100% rename from tests/run/tasty-argument-tree-1.check rename to tests/run-macros/tasty-argument-tree-1.check diff --git a/tests/run/tasty-argument-tree-1/quoted_1.scala b/tests/run-macros/tasty-argument-tree-1/quoted_1.scala similarity index 100% rename from tests/run/tasty-argument-tree-1/quoted_1.scala rename to tests/run-macros/tasty-argument-tree-1/quoted_1.scala diff --git a/tests/run/tasty-argument-tree-1/quoted_2.scala b/tests/run-macros/tasty-argument-tree-1/quoted_2.scala similarity index 100% rename from tests/run/tasty-argument-tree-1/quoted_2.scala rename to tests/run-macros/tasty-argument-tree-1/quoted_2.scala diff --git a/tests/run/tasty-custom-show.check b/tests/run-macros/tasty-custom-show.check similarity index 100% rename from tests/run/tasty-custom-show.check rename to tests/run-macros/tasty-custom-show.check diff --git a/tests/run/tasty-custom-show/quoted_1.scala b/tests/run-macros/tasty-custom-show/quoted_1.scala similarity index 100% rename from tests/run/tasty-custom-show/quoted_1.scala rename to tests/run-macros/tasty-custom-show/quoted_1.scala diff --git a/tests/run/tasty-custom-show/quoted_2.scala b/tests/run-macros/tasty-custom-show/quoted_2.scala similarity index 100% rename from tests/run/tasty-custom-show/quoted_2.scala rename to tests/run-macros/tasty-custom-show/quoted_2.scala diff --git a/tests/run/tasty-dealias.check b/tests/run-macros/tasty-dealias.check similarity index 100% rename from tests/run/tasty-dealias.check rename to tests/run-macros/tasty-dealias.check diff --git a/tests/run/tasty-dealias/quoted_1.scala b/tests/run-macros/tasty-dealias/quoted_1.scala similarity index 100% rename from tests/run/tasty-dealias/quoted_1.scala rename to tests/run-macros/tasty-dealias/quoted_1.scala diff --git a/tests/run/tasty-dealias/quoted_2.scala b/tests/run-macros/tasty-dealias/quoted_2.scala similarity index 100% rename from tests/run/tasty-dealias/quoted_2.scala rename to tests/run-macros/tasty-dealias/quoted_2.scala diff --git a/tests/run/tasty-definitions-1.check b/tests/run-macros/tasty-definitions-1.check similarity index 100% rename from tests/run/tasty-definitions-1.check rename to tests/run-macros/tasty-definitions-1.check diff --git a/tests/run/tasty-definitions-1/quoted_1.scala b/tests/run-macros/tasty-definitions-1/quoted_1.scala similarity index 100% rename from tests/run/tasty-definitions-1/quoted_1.scala rename to tests/run-macros/tasty-definitions-1/quoted_1.scala diff --git a/tests/run/tasty-definitions-1/quoted_2.scala b/tests/run-macros/tasty-definitions-1/quoted_2.scala similarity index 100% rename from tests/run/tasty-definitions-1/quoted_2.scala rename to tests/run-macros/tasty-definitions-1/quoted_2.scala diff --git a/tests/run/tasty-eval.check b/tests/run-macros/tasty-eval.check similarity index 100% rename from tests/run/tasty-eval.check rename to tests/run-macros/tasty-eval.check diff --git a/tests/run/tasty-eval/quoted_1.scala b/tests/run-macros/tasty-eval/quoted_1.scala similarity index 100% rename from tests/run/tasty-eval/quoted_1.scala rename to tests/run-macros/tasty-eval/quoted_1.scala diff --git a/tests/run/tasty-eval/quoted_2.scala b/tests/run-macros/tasty-eval/quoted_2.scala similarity index 100% rename from tests/run/tasty-eval/quoted_2.scala rename to tests/run-macros/tasty-eval/quoted_2.scala diff --git a/tests/run/tasty-extractors-1.check b/tests/run-macros/tasty-extractors-1.check similarity index 100% rename from tests/run/tasty-extractors-1.check rename to tests/run-macros/tasty-extractors-1.check diff --git a/tests/run/tasty-extractors-1/quoted_1.scala b/tests/run-macros/tasty-extractors-1/quoted_1.scala similarity index 100% rename from tests/run/tasty-extractors-1/quoted_1.scala rename to tests/run-macros/tasty-extractors-1/quoted_1.scala diff --git a/tests/run/tasty-extractors-1/quoted_2.scala b/tests/run-macros/tasty-extractors-1/quoted_2.scala similarity index 100% rename from tests/run/tasty-extractors-1/quoted_2.scala rename to tests/run-macros/tasty-extractors-1/quoted_2.scala diff --git a/tests/run/tasty-extractors-2.check b/tests/run-macros/tasty-extractors-2.check similarity index 100% rename from tests/run/tasty-extractors-2.check rename to tests/run-macros/tasty-extractors-2.check diff --git a/tests/run/tasty-extractors-2/quoted_1.scala b/tests/run-macros/tasty-extractors-2/quoted_1.scala similarity index 100% rename from tests/run/tasty-extractors-2/quoted_1.scala rename to tests/run-macros/tasty-extractors-2/quoted_1.scala diff --git a/tests/run/tasty-extractors-2/quoted_2.scala b/tests/run-macros/tasty-extractors-2/quoted_2.scala similarity index 100% rename from tests/run/tasty-extractors-2/quoted_2.scala rename to tests/run-macros/tasty-extractors-2/quoted_2.scala diff --git a/tests/run/tasty-extractors-3.check b/tests/run-macros/tasty-extractors-3.check similarity index 100% rename from tests/run/tasty-extractors-3.check rename to tests/run-macros/tasty-extractors-3.check diff --git a/tests/run/tasty-extractors-3/quoted_1.scala b/tests/run-macros/tasty-extractors-3/quoted_1.scala similarity index 100% rename from tests/run/tasty-extractors-3/quoted_1.scala rename to tests/run-macros/tasty-extractors-3/quoted_1.scala diff --git a/tests/run/tasty-extractors-3/quoted_2.scala b/tests/run-macros/tasty-extractors-3/quoted_2.scala similarity index 100% rename from tests/run/tasty-extractors-3/quoted_2.scala rename to tests/run-macros/tasty-extractors-3/quoted_2.scala diff --git a/tests/run/tasty-extractors-constants-1.check b/tests/run-macros/tasty-extractors-constants-1.check similarity index 100% rename from tests/run/tasty-extractors-constants-1.check rename to tests/run-macros/tasty-extractors-constants-1.check diff --git a/tests/run/tasty-extractors-constants-1/quoted_1.scala b/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala similarity index 100% rename from tests/run/tasty-extractors-constants-1/quoted_1.scala rename to tests/run-macros/tasty-extractors-constants-1/quoted_1.scala diff --git a/tests/run/tasty-extractors-constants-1/quoted_2.scala b/tests/run-macros/tasty-extractors-constants-1/quoted_2.scala similarity index 100% rename from tests/run/tasty-extractors-constants-1/quoted_2.scala rename to tests/run-macros/tasty-extractors-constants-1/quoted_2.scala diff --git a/tests/run/tasty-extractors-types.check b/tests/run-macros/tasty-extractors-types.check similarity index 100% rename from tests/run/tasty-extractors-types.check rename to tests/run-macros/tasty-extractors-types.check diff --git a/tests/run/tasty-extractors-types/quoted_1.scala b/tests/run-macros/tasty-extractors-types/quoted_1.scala similarity index 100% rename from tests/run/tasty-extractors-types/quoted_1.scala rename to tests/run-macros/tasty-extractors-types/quoted_1.scala diff --git a/tests/run/tasty-extractors-types/quoted_2.scala b/tests/run-macros/tasty-extractors-types/quoted_2.scala similarity index 100% rename from tests/run/tasty-extractors-types/quoted_2.scala rename to tests/run-macros/tasty-extractors-types/quoted_2.scala diff --git a/tests/run/tasty-getfile-implicit-fun-context.check b/tests/run-macros/tasty-getfile-implicit-fun-context.check similarity index 100% rename from tests/run/tasty-getfile-implicit-fun-context.check rename to tests/run-macros/tasty-getfile-implicit-fun-context.check diff --git a/tests/run/tasty-getfile-implicit-fun-context/App_2.scala b/tests/run-macros/tasty-getfile-implicit-fun-context/App_2.scala similarity index 100% rename from tests/run/tasty-getfile-implicit-fun-context/App_2.scala rename to tests/run-macros/tasty-getfile-implicit-fun-context/App_2.scala diff --git a/tests/run/tasty-getfile-implicit-fun-context/Macro_1.scala b/tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala similarity index 100% rename from tests/run/tasty-getfile-implicit-fun-context/Macro_1.scala rename to tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala diff --git a/tests/run/tasty-getfile.check b/tests/run-macros/tasty-getfile.check similarity index 100% rename from tests/run/tasty-getfile.check rename to tests/run-macros/tasty-getfile.check diff --git a/tests/run/tasty-getfile/App_2.scala b/tests/run-macros/tasty-getfile/App_2.scala similarity index 100% rename from tests/run/tasty-getfile/App_2.scala rename to tests/run-macros/tasty-getfile/App_2.scala diff --git a/tests/run/tasty-getfile/Macro_1.scala b/tests/run-macros/tasty-getfile/Macro_1.scala similarity index 100% rename from tests/run/tasty-getfile/Macro_1.scala rename to tests/run-macros/tasty-getfile/Macro_1.scala diff --git a/tests/run/tasty-implicit-fun-context-2.check b/tests/run-macros/tasty-implicit-fun-context-2.check similarity index 100% rename from tests/run/tasty-implicit-fun-context-2.check rename to tests/run-macros/tasty-implicit-fun-context-2.check diff --git a/tests/run/tasty-implicit-fun-context-2/App_2.scala b/tests/run-macros/tasty-implicit-fun-context-2/App_2.scala similarity index 100% rename from tests/run/tasty-implicit-fun-context-2/App_2.scala rename to tests/run-macros/tasty-implicit-fun-context-2/App_2.scala diff --git a/tests/run/tasty-implicit-fun-context-2/Macro_1.scala b/tests/run-macros/tasty-implicit-fun-context-2/Macro_1.scala similarity index 100% rename from tests/run/tasty-implicit-fun-context-2/Macro_1.scala rename to tests/run-macros/tasty-implicit-fun-context-2/Macro_1.scala diff --git a/tests/run/tasty-indexed-map/quoted_1.scala b/tests/run-macros/tasty-indexed-map/quoted_1.scala similarity index 100% rename from tests/run/tasty-indexed-map/quoted_1.scala rename to tests/run-macros/tasty-indexed-map/quoted_1.scala diff --git a/tests/run/tasty-indexed-map/quoted_2.scala b/tests/run-macros/tasty-indexed-map/quoted_2.scala similarity index 100% rename from tests/run/tasty-indexed-map/quoted_2.scala rename to tests/run-macros/tasty-indexed-map/quoted_2.scala diff --git a/tests/run/tasty-interpolation-1.check b/tests/run-macros/tasty-interpolation-1.check similarity index 100% rename from tests/run/tasty-interpolation-1.check rename to tests/run-macros/tasty-interpolation-1.check diff --git a/tests/run/tasty-interpolation-1/Macro.scala b/tests/run-macros/tasty-interpolation-1/Macro.scala similarity index 100% rename from tests/run/tasty-interpolation-1/Macro.scala rename to tests/run-macros/tasty-interpolation-1/Macro.scala diff --git a/tests/run/tasty-interpolation-1/Test_2.scala b/tests/run-macros/tasty-interpolation-1/Test_2.scala similarity index 100% rename from tests/run/tasty-interpolation-1/Test_2.scala rename to tests/run-macros/tasty-interpolation-1/Test_2.scala diff --git a/tests/run/tasty-linenumber-2.check b/tests/run-macros/tasty-linenumber-2.check similarity index 100% rename from tests/run/tasty-linenumber-2.check rename to tests/run-macros/tasty-linenumber-2.check diff --git a/tests/run/tasty-linenumber-2/quoted_1.scala b/tests/run-macros/tasty-linenumber-2/quoted_1.scala similarity index 100% rename from tests/run/tasty-linenumber-2/quoted_1.scala rename to tests/run-macros/tasty-linenumber-2/quoted_1.scala diff --git a/tests/run/tasty-linenumber-2/quoted_2.scala b/tests/run-macros/tasty-linenumber-2/quoted_2.scala similarity index 100% rename from tests/run/tasty-linenumber-2/quoted_2.scala rename to tests/run-macros/tasty-linenumber-2/quoted_2.scala diff --git a/tests/run/tasty-linenumber.check b/tests/run-macros/tasty-linenumber.check similarity index 100% rename from tests/run/tasty-linenumber.check rename to tests/run-macros/tasty-linenumber.check diff --git a/tests/run/tasty-linenumber/quoted_1.scala b/tests/run-macros/tasty-linenumber/quoted_1.scala similarity index 100% rename from tests/run/tasty-linenumber/quoted_1.scala rename to tests/run-macros/tasty-linenumber/quoted_1.scala diff --git a/tests/run/tasty-linenumber/quoted_2.scala b/tests/run-macros/tasty-linenumber/quoted_2.scala similarity index 100% rename from tests/run/tasty-linenumber/quoted_2.scala rename to tests/run-macros/tasty-linenumber/quoted_2.scala diff --git a/tests/run/tasty-location.check b/tests/run-macros/tasty-location.check similarity index 100% rename from tests/run/tasty-location.check rename to tests/run-macros/tasty-location.check diff --git a/tests/run/tasty-location/quoted_1.scala b/tests/run-macros/tasty-location/quoted_1.scala similarity index 100% rename from tests/run/tasty-location/quoted_1.scala rename to tests/run-macros/tasty-location/quoted_1.scala diff --git a/tests/run/tasty-location/quoted_2.scala b/tests/run-macros/tasty-location/quoted_2.scala similarity index 100% rename from tests/run/tasty-location/quoted_2.scala rename to tests/run-macros/tasty-location/quoted_2.scala diff --git a/tests/run/tasty-macro-assert.check b/tests/run-macros/tasty-macro-assert.check similarity index 100% rename from tests/run/tasty-macro-assert.check rename to tests/run-macros/tasty-macro-assert.check diff --git a/tests/run/tasty-macro-assert/quoted_1.scala b/tests/run-macros/tasty-macro-assert/quoted_1.scala similarity index 100% rename from tests/run/tasty-macro-assert/quoted_1.scala rename to tests/run-macros/tasty-macro-assert/quoted_1.scala diff --git a/tests/run/tasty-macro-assert/quoted_2.scala b/tests/run-macros/tasty-macro-assert/quoted_2.scala similarity index 100% rename from tests/run/tasty-macro-assert/quoted_2.scala rename to tests/run-macros/tasty-macro-assert/quoted_2.scala diff --git a/tests/run/tasty-macro-const/quoted_1.scala b/tests/run-macros/tasty-macro-const/quoted_1.scala similarity index 100% rename from tests/run/tasty-macro-const/quoted_1.scala rename to tests/run-macros/tasty-macro-const/quoted_1.scala diff --git a/tests/run/tasty-macro-const/quoted_2.scala b/tests/run-macros/tasty-macro-const/quoted_2.scala similarity index 100% rename from tests/run/tasty-macro-const/quoted_2.scala rename to tests/run-macros/tasty-macro-const/quoted_2.scala diff --git a/tests/run/tasty-macro-positions.check b/tests/run-macros/tasty-macro-positions.check similarity index 100% rename from tests/run/tasty-macro-positions.check rename to tests/run-macros/tasty-macro-positions.check diff --git a/tests/run/tasty-macro-positions/quoted_1.scala b/tests/run-macros/tasty-macro-positions/quoted_1.scala similarity index 100% rename from tests/run/tasty-macro-positions/quoted_1.scala rename to tests/run-macros/tasty-macro-positions/quoted_1.scala diff --git a/tests/run/tasty-macro-positions/quoted_2.scala b/tests/run-macros/tasty-macro-positions/quoted_2.scala similarity index 100% rename from tests/run/tasty-macro-positions/quoted_2.scala rename to tests/run-macros/tasty-macro-positions/quoted_2.scala diff --git a/tests/run/tasty-original-source.check b/tests/run-macros/tasty-original-source.check similarity index 100% rename from tests/run/tasty-original-source.check rename to tests/run-macros/tasty-original-source.check diff --git a/tests/run/tasty-original-source/Macros_1.scala b/tests/run-macros/tasty-original-source/Macros_1.scala similarity index 100% rename from tests/run/tasty-original-source/Macros_1.scala rename to tests/run-macros/tasty-original-source/Macros_1.scala diff --git a/tests/run/tasty-original-source/Test_2.scala b/tests/run-macros/tasty-original-source/Test_2.scala similarity index 100% rename from tests/run/tasty-original-source/Test_2.scala rename to tests/run-macros/tasty-original-source/Test_2.scala diff --git a/tests/run/tasty-positioned.check b/tests/run-macros/tasty-positioned.check similarity index 100% rename from tests/run/tasty-positioned.check rename to tests/run-macros/tasty-positioned.check diff --git a/tests/run/tasty-positioned/quoted_1.scala b/tests/run-macros/tasty-positioned/quoted_1.scala similarity index 100% rename from tests/run/tasty-positioned/quoted_1.scala rename to tests/run-macros/tasty-positioned/quoted_1.scala diff --git a/tests/run/tasty-positioned/quoted_2.scala b/tests/run-macros/tasty-positioned/quoted_2.scala similarity index 100% rename from tests/run/tasty-positioned/quoted_2.scala rename to tests/run-macros/tasty-positioned/quoted_2.scala diff --git a/tests/run/tasty-seal-method/quoted_1.scala b/tests/run-macros/tasty-seal-method/quoted_1.scala similarity index 100% rename from tests/run/tasty-seal-method/quoted_1.scala rename to tests/run-macros/tasty-seal-method/quoted_1.scala diff --git a/tests/run/tasty-seal-method/quoted_2.scala b/tests/run-macros/tasty-seal-method/quoted_2.scala similarity index 100% rename from tests/run/tasty-seal-method/quoted_2.scala rename to tests/run-macros/tasty-seal-method/quoted_2.scala diff --git a/tests/run/tasty-subtyping.check b/tests/run-macros/tasty-subtyping.check similarity index 100% rename from tests/run/tasty-subtyping.check rename to tests/run-macros/tasty-subtyping.check diff --git a/tests/run/tasty-subtyping/quoted_1.scala b/tests/run-macros/tasty-subtyping/quoted_1.scala similarity index 100% rename from tests/run/tasty-subtyping/quoted_1.scala rename to tests/run-macros/tasty-subtyping/quoted_1.scala diff --git a/tests/run/tasty-subtyping/quoted_2.scala b/tests/run-macros/tasty-subtyping/quoted_2.scala similarity index 100% rename from tests/run/tasty-subtyping/quoted_2.scala rename to tests/run-macros/tasty-subtyping/quoted_2.scala diff --git a/tests/run/tasty-tree-map.check b/tests/run-macros/tasty-tree-map.check similarity index 100% rename from tests/run/tasty-tree-map.check rename to tests/run-macros/tasty-tree-map.check diff --git a/tests/run/tasty-tree-map/quoted_1.scala b/tests/run-macros/tasty-tree-map/quoted_1.scala similarity index 100% rename from tests/run/tasty-tree-map/quoted_1.scala rename to tests/run-macros/tasty-tree-map/quoted_1.scala diff --git a/tests/run/tasty-tree-map/quoted_2.scala b/tests/run-macros/tasty-tree-map/quoted_2.scala similarity index 100% rename from tests/run/tasty-tree-map/quoted_2.scala rename to tests/run-macros/tasty-tree-map/quoted_2.scala diff --git a/tests/run/tasty-typeof.check b/tests/run-macros/tasty-typeof.check similarity index 100% rename from tests/run/tasty-typeof.check rename to tests/run-macros/tasty-typeof.check diff --git a/tests/run/tasty-typeof/Macro_1.scala b/tests/run-macros/tasty-typeof/Macro_1.scala similarity index 100% rename from tests/run/tasty-typeof/Macro_1.scala rename to tests/run-macros/tasty-typeof/Macro_1.scala diff --git a/tests/run/tasty-typeof/Test_2.scala b/tests/run-macros/tasty-typeof/Test_2.scala similarity index 100% rename from tests/run/tasty-typeof/Test_2.scala rename to tests/run-macros/tasty-typeof/Test_2.scala diff --git a/tests/run/type-show/Macro_1.scala b/tests/run-macros/type-show/Macro_1.scala similarity index 100% rename from tests/run/type-show/Macro_1.scala rename to tests/run-macros/type-show/Macro_1.scala diff --git a/tests/run/type-show/Test_2.scala b/tests/run-macros/type-show/Test_2.scala similarity index 100% rename from tests/run/type-show/Test_2.scala rename to tests/run-macros/type-show/Test_2.scala diff --git a/tests/run/xml-interpolation-1/Test_2.scala b/tests/run-macros/xml-interpolation-1/Test_2.scala similarity index 100% rename from tests/run/xml-interpolation-1/Test_2.scala rename to tests/run-macros/xml-interpolation-1/Test_2.scala diff --git a/tests/run/xml-interpolation-1/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala similarity index 100% rename from tests/run/xml-interpolation-1/XmlQuote_1.scala rename to tests/run-macros/xml-interpolation-1/XmlQuote_1.scala diff --git a/tests/run/xml-interpolation-2/Test_2.scala b/tests/run-macros/xml-interpolation-2/Test_2.scala similarity index 100% rename from tests/run/xml-interpolation-2/Test_2.scala rename to tests/run-macros/xml-interpolation-2/Test_2.scala diff --git a/tests/run/xml-interpolation-2/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala similarity index 100% rename from tests/run/xml-interpolation-2/XmlQuote_1.scala rename to tests/run-macros/xml-interpolation-2/XmlQuote_1.scala diff --git a/tests/run/xml-interpolation-3/Test_2.scala b/tests/run-macros/xml-interpolation-3/Test_2.scala similarity index 100% rename from tests/run/xml-interpolation-3/Test_2.scala rename to tests/run-macros/xml-interpolation-3/Test_2.scala diff --git a/tests/run/xml-interpolation-3/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala similarity index 100% rename from tests/run/xml-interpolation-3/XmlQuote_1.scala rename to tests/run-macros/xml-interpolation-3/XmlQuote_1.scala diff --git a/tests/run/xml-interpolation-4/Macros_1.scala b/tests/run-macros/xml-interpolation-4/Macros_1.scala similarity index 100% rename from tests/run/xml-interpolation-4/Macros_1.scala rename to tests/run-macros/xml-interpolation-4/Macros_1.scala diff --git a/tests/run/xml-interpolation-4/Test_2.scala b/tests/run-macros/xml-interpolation-4/Test_2.scala similarity index 100% rename from tests/run/xml-interpolation-4/Test_2.scala rename to tests/run-macros/xml-interpolation-4/Test_2.scala diff --git a/tests/run-with-compiler/quote-splice-interpret-1.check b/tests/run-with-compiler/quote-splice-interpret-1.check deleted file mode 100644 index d25232800f82..000000000000 --- a/tests/run-with-compiler/quote-splice-interpret-1.check +++ /dev/null @@ -1,2 +0,0 @@ -true -false \ No newline at end of file From 37fa919c809684697e0fc63b77e457342f0ed559 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 21 Apr 2019 22:21:16 +0200 Subject: [PATCH 3/4] Move REPL test involving a macro Like explained in the previous commit this kind of tests should be bootstrapped-only. --- compiler/test-resources/{repl => repl-macros}/i6007 | 0 compiler/test/dotty/tools/repl/ScriptedTests.scala | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) rename compiler/test-resources/{repl => repl-macros}/i6007 (100%) diff --git a/compiler/test-resources/repl/i6007 b/compiler/test-resources/repl-macros/i6007 similarity index 100% rename from compiler/test-resources/repl/i6007 rename to compiler/test-resources/repl-macros/i6007 diff --git a/compiler/test/dotty/tools/repl/ScriptedTests.scala b/compiler/test/dotty/tools/repl/ScriptedTests.scala index a517145d235e..bdc76f1e1c00 100644 --- a/compiler/test/dotty/tools/repl/ScriptedTests.scala +++ b/compiler/test/dotty/tools/repl/ScriptedTests.scala @@ -1,4 +1,5 @@ -package dotty.tools +package dotty +package tools package repl import java.io.{File => JFile} @@ -6,6 +7,7 @@ import java.lang.System.{lineSeparator => EOL} import org.junit.Assert._ import org.junit.Test +import org.junit.experimental.categories.Category import scala.collection.mutable.ArrayBuffer import scala.io.Source @@ -91,4 +93,7 @@ class ScriptedTests extends ReplTest with MessageRendering { @Test def replTests = scripts("/repl").foreach(testFile) @Test def typePrinterTests = scripts("/type-printer").foreach(testFile) + + @Category(Array(classOf[BootstrappedOnlyTests])) + @Test def replMacrosTests = scripts("/repl-macros").foreach(testFile) } From ee7cc5353899d6f0064b363a9ba6c9902100abcc Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 22 Apr 2019 14:06:28 +0200 Subject: [PATCH 4/4] Delete or move stray .check files Some check files were not deleted or moved when the corresponding test was deleted or moved. --- tests/{ => disabled}/run/i4947a.check | 0 .../{ => invalid}/run/typelevel-patmat.check | 0 tests/{ => invalid}/run/typelevel.check | 0 tests/{ => pending}/run/tasty-comments.check | 0 tests/run/TupleAbstract.check | 34 ------------------- tests/run/t3452b-bcode.check | 2 -- 6 files changed, 36 deletions(-) rename tests/{ => disabled}/run/i4947a.check (100%) rename tests/{ => invalid}/run/typelevel-patmat.check (100%) rename tests/{ => invalid}/run/typelevel.check (100%) rename tests/{ => pending}/run/tasty-comments.check (100%) delete mode 100644 tests/run/TupleAbstract.check delete mode 100644 tests/run/t3452b-bcode.check diff --git a/tests/run/i4947a.check b/tests/disabled/run/i4947a.check similarity index 100% rename from tests/run/i4947a.check rename to tests/disabled/run/i4947a.check diff --git a/tests/run/typelevel-patmat.check b/tests/invalid/run/typelevel-patmat.check similarity index 100% rename from tests/run/typelevel-patmat.check rename to tests/invalid/run/typelevel-patmat.check diff --git a/tests/run/typelevel.check b/tests/invalid/run/typelevel.check similarity index 100% rename from tests/run/typelevel.check rename to tests/invalid/run/typelevel.check diff --git a/tests/run/tasty-comments.check b/tests/pending/run/tasty-comments.check similarity index 100% rename from tests/run/tasty-comments.check rename to tests/pending/run/tasty-comments.check diff --git a/tests/run/TupleAbstract.check b/tests/run/TupleAbstract.check deleted file mode 100644 index 6957f0548302..000000000000 --- a/tests/run/TupleAbstract.check +++ /dev/null @@ -1,34 +0,0 @@ -() -(1) -(A,1) -(2,A,1) -(B,2,A,1) -(3,B,2,A,1) -(C,3,B,2,A,1) -(4,C,3,B,2,A,1) -(D,4,C,3,B,2,A,1) -h1 = 1 -h2 = A -h7 = 4 -h8 = D -t1 = () -t2 = (1) -t7 = (C,3,B,2,A,1) -t8 = (4,C,3,B,2,A,1) -a1_0 = 1 -a2_0 = A -a3_1 = A -a4_3 = 1 -a6_4 = A -a8_0 = D -c0_0 = () -c0_1 = (1) -c1_0 = (1) -c0_4 = (B,2,A,1) -c4_0 = (B,2,A,1) -c1_1 = (1,1) -c1_8 = (1,D,4,C,3,B,2,A,1) -c2_1 = (A,1,1) -c2_2 = (A,1,A,1) -c2_3 = (A,1,2,A,1) -c3_3 = (2,A,1,2,A,1) diff --git a/tests/run/t3452b-bcode.check b/tests/run/t3452b-bcode.check deleted file mode 100644 index 204c3d043787..000000000000 --- a/tests/run/t3452b-bcode.check +++ /dev/null @@ -1,2 +0,0 @@ -Search received: test -SearchC received: test