Simplify macro tests with custom args (#18369)

Author: dwijnand

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

@@ -29,10 +29,6 @@ class BootstrappedOnlyCompilationTests {
     aggregateTests(
       compileFilesInDir("tests/bench", defaultOptions.without("-Yno-deep-subtypes")),
       compileFilesInDir("tests/pos-macros", defaultOptions.and("-Xcheck-macros")),
-      compileFilesInDir("tests/pos-custom-args/semanticdb", defaultOptions.and("-Xsemanticdb")),
-      compileDir("tests/pos-special/i7592", defaultOptions.and("-Yretain-trees")),
-      compileDir("tests/pos-special/i11331.1", defaultOptions),
-      compileDir("tests/pos-custom-args/i13405", defaultOptions.and("-Xfatal-warnings")),
     ).checkCompile()
   }
 
@@ -107,13 +103,8 @@ class BootstrappedOnlyCompilationTests {
 
   @Test def negMacros: Unit = {
     implicit val testGroup: TestGroup = TestGroup("compileNegWithCompiler")
-    aggregateTests(
-      compileFilesInDir("tests/neg-macros", defaultOptions.and("-Xcheck-macros")),
-      compileFilesInDir("tests/neg-inlines-strict", defaultOptions.and("-source", "future")),
-      compileFile("tests/pos-macros/i9570.scala", defaultOptions.and("-Xfatal-warnings")),
-      compileFile("tests/pos-macros/macro-deprecation.scala", defaultOptions.and("-Xfatal-warnings", "-deprecation")),
-      compileFile("tests/pos-macros/macro-experimental.scala", defaultOptions.and("-Yno-experimental")),
-    ).checkExpectedErrors()
+    compileFilesInDir("tests/neg-macros", defaultOptions.and("-Xcheck-macros"))
+      .checkExpectedErrors()
   }
 
   @Test def negWithCompiler: Unit = {
@@ -128,26 +119,20 @@ class BootstrappedOnlyCompilationTests {
 
   @Test def runMacros: Unit = {
     implicit val testGroup: TestGroup = TestGroup("runMacros")
-    aggregateTests(
-      compileFilesInDir("tests/run-macros", defaultOptions.and("-Xcheck-macros")),
-      compileFilesInDir("tests/run-custom-args/Yretain-trees", defaultOptions and "-Yretain-trees"),
-      compileFilesInDir("tests/run-custom-args/Yread-comments", defaultOptions and "-Yread-docs"),
-      compileFilesInDir("tests/run-custom-args/run-macros-erased", defaultOptions.and("-language:experimental.erasedDefinitions").and("-Xcheck-macros")),
-      compileDir("tests/run-custom-args/Xmacro-settings/simple", defaultOptions.and("-Xmacro-settings:one,two,three")),
-      compileDir("tests/run-custom-args/Xmacro-settings/compileTimeEnv", defaultOptions.and("-Xmacro-settings:a,b=1,c.b.a=x.y.z=1,myLogger.level=INFO")),
-    )
-  }.checkRuns()
+    compileFilesInDir("tests/run-macros", defaultOptions.and("-Xcheck-macros"))
+      .checkRuns()
+  }
 
   @Test def runWithCompiler: Unit = {
     implicit val testGroup: TestGroup = TestGroup("runWithCompiler")
     val basicTests = List(
       compileFilesInDir("tests/run-with-compiler", withCompilerOptions),
       compileFilesInDir("tests/run-staging", withStagingOptions),
-      compileFilesInDir("tests/run-custom-args/tasty-inspector", withTastyInspectorOptions)
+      compileFilesInDir("tests/run-tasty-inspector", withTastyInspectorOptions)
     )
     val tests =
       if scala.util.Properties.isWin then basicTests
-      else compileDir("tests/run-custom-args/tasty-interpreter", withTastyInspectorOptions) :: basicTests
+      else compileDir("tests/old-tasty-interpreter-prototype", withTastyInspectorOptions) :: basicTests
 
     aggregateTests(tests: _*).checkRuns()
   }

tests/pos-macros/i9570.scala renamed to tests/neg-macros/i9570.scala

@@ -1,3 +1,5 @@
+// scalac: -Xfatal-warnings
+
 import scala.quoted.*
 
 object Macros {

tests/pos-macros/macro-deprecation.scala renamed to tests/neg-macros/macro-deprecation.scala

@@ -1,3 +1,5 @@
+// scalac: -Xfatal-warnings -deprecation
+
 import scala.quoted.*
 
 inline def f = ${ impl } // error

tests/pos-macros/macro-experimental.scala renamed to tests/neg-macros/macro-experimental.scala

@@ -1,3 +1,5 @@
+// scalac: -Yno-experimental
+
 import scala.quoted.*
 import scala.annotation.experimental
 

tests/neg-inlines-strict/i9685bis.check renamed to tests/neg/i9685bis.check

@@ -1,5 +1,5 @@
--- [E008] Not Found Error: tests/neg-inlines-strict/i9685bis.scala:23:4 ------------------------------------------------
-23 |  1.asdf // error
+-- [E008] Not Found Error: tests/neg/i9685bis.scala:25:4 ---------------------------------------------------------------
+25 |  1.asdf // error
    |  ^^^^^^
    |  value asdf is not a member of Int, but could be made available as an extension method.
    |

tests/neg-inlines-strict/i9685bis.scala renamed to tests/neg/i9685bis.scala

@@ -1,3 +1,5 @@
+// scalac: -source future
+
 package foo
 
 import scala.language.implicitConversions

tests/run-custom-args/tasty-interpreter/InterpretedMain.scala renamed to tests/old-tasty-interpreter-prototype/InterpretedMain.scala

@@ -0,0 +1,3 @@
+// scalac: -Xfatal-warnings
+
+@main def main: Unit = hh()

tests/run-custom-args/tasty-interpreter/Precompiled.scala renamed to tests/old-tasty-interpreter-prototype/Precompiled.scala

@@ -1,3 +1,5 @@
+// scalac: -Yretain-trees
+
 def return1 = 1
 
 def testReturn1 = {

tests/run-custom-args/tasty-interpreter/Test.scala renamed to tests/old-tasty-interpreter-prototype/Test.scala

@@ -1,3 +1,4 @@
+// scalac: -Xsemanticdb
 
 object Test {
   def main(args: Array[String]): Unit = {

tests/run-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala renamed to tests/old-tasty-interpreter-prototype/interpreter/TastyInterpreter.scala

@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import scala.quoted.*
 
 object Succ:

tests/run-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala renamed to tests/old-tasty-interpreter-prototype/interpreter/TreeInterpreter.scala

@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import quoted.*
 
 object CodeImpl {

tests/run-custom-args/tasty-interpreter/interpreter/jvm/Interpreter.scala renamed to tests/old-tasty-interpreter-prototype/interpreter/jvm/Interpreter.scala

@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import quoted.*
 
 object TestImpl {

tests/run-custom-args/tasty-interpreter/interpreter/jvm/JVMReflection.scala renamed to tests/old-tasty-interpreter-prototype/interpreter/jvm/JVMReflection.scala

@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 object Test {
 
   def test = TestImpl.fun("")

tests/run-custom-args/tasty-interpreter/notes.md renamed to tests/old-tasty-interpreter-prototype/notes.md

@@ -1,3 +1,5 @@
+// scalac: -Xmacro-settings:a,b=1,c.b.a=x.y.z=1,myLogger.level=INFO
+
 import scala.compiletime.*
 
 object Test {
@@ -16,10 +18,10 @@ object Test {
   }
 
   def runBasic(): Unit = {
-    printEnv("a")    
-    printEnv("b")    
-    printEnv("c.b.a")    
-    printEnv("wat")    
+    printEnv("a")
+    printEnv("b")
+    printEnv("c.b.a")
+    printEnv("wat")
   }
 
   inline def printEnv(inline k: String): Unit =

tests/pos-custom-args/i13405/Test.scala

@@ -1,3 +1,5 @@
+// scalac: -Xmacro-settings:one,two,three
+
 import x.*
 
 object Test {

tests/pos-special/i11331.1/Macro_1.scala renamed to tests/pos-macros/i11331a/Macro_1.scala

@@ -1,3 +1,5 @@
+// scalac: -Yread-docs
+
 @main def Test(): Unit = {
     println(getDocString[Data])
     assert(getDocString[Data].nonEmpty)

tests/pos-special/i11331.1/Test_2.scala renamed to tests/pos-macros/i11331a/Test_2.scala

@@ -1,3 +1,5 @@
+// scalac: -Yread-docs
+
 @main def Test(): Unit = {
     val res = getDocString[scala.quoted.Quotes]
     println(res)

tests/pos-custom-args/i13405/Macro.scala renamed to tests/pos-macros/i13405/Macro.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.erasedDefinitions
+
 import scala.quoted.*
 
 inline def testExpr(inline body: Any) = ${ testExprImpl('body) }

tests/pos-macros/i13405/Test.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.erasedDefinitions
+
 @main def Test: Unit =
   println("case erased: " + testExpr { def erasedfn1(erased x: String) = "placeholder"; erasedfn1("arg1")})
   println("case erased nested: " + testExpr {

tests/pos-special/i7592/Macros_1.scala renamed to tests/pos-macros/i7592/Macros_1.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.erasedDefinitions
+
 import scala.quoted.*
 
 object Macro {

tests/pos-special/i7592/Test_2.scala renamed to tests/pos-macros/i7592/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.erasedDefinitions
+
 trait Box {
   type T
 }

tests/pos-custom-args/semanticdb/inline-unapply/App_2.scala renamed to tests/pos-macros/semanticdb-inline-unapply/App_2.scala

@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 object Test {
   def main(args: Array[String]): Unit = {

tests/pos-custom-args/semanticdb/inline-unapply/Macro_1.scala renamed to tests/pos-macros/semanticdb-inline-unapply/Macro_1.scala

@@ -1,3 +1,5 @@
+// scalac: -Yretain-trees
+
 object Test {
   def main(args: Array[String]): Unit = {
     println(Foo.inspectBody(Foo.foo))

tests/pos-custom-args/semanticdb/macro-pos/example_1.scala renamed to tests/pos-macros/semanticdb-macro-pos/example_1.scala

@@ -1,3 +1,5 @@
+// scalac: -Yretain-trees
+
 object Test {
 
   def main(args: Array[String]): Unit = {

tests/pos-custom-args/semanticdb/macro-pos/example_2.scala renamed to tests/pos-macros/semanticdb-macro-pos/example_2.scala

@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 import Macros.*
 

tests/pos-custom-args/semanticdb/macro-pos/example_3.scala renamed to tests/pos-macros/semanticdb-macro-pos/example_3.scala

@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 object Test {
   def main(args: Array[String]): Unit = {

tests/run-custom-args/Xmacro-settings/compileTimeEnv.check renamed to tests/run-macros/Xmacro-settings-compileTimeEnv.check

@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 object Test {
   def main(args: Array[String]): Unit = {

tests/run-custom-args/Xmacro-settings/compileTimeEnv/Logging.scala renamed to tests/run-macros/Xmacro-settings-compileTimeEnv/Logging.scala

@@ -126,9 +126,9 @@ val experimentalDefinitionInLibrary = Set(
          |Found @experimental definition in library not listed:
          |${missingFromList.toSeq.sorted.mkString("\n")}
          |
-         |If added new experimental definitions to the library, add them to the list in tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala
+         |If added new experimental definitions to the library, add them to the list in tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala
          |
-         |Test only: sbt "scala3-bootstrapped/testCompilation tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala"
+         |Test only: sbt "scala3-bootstrapped/testCompilation tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala"
          |""".stripMargin
       )
       assert(missingInLibrary.isEmpty,
@@ -137,9 +137,9 @@ val experimentalDefinitionInLibrary = Set(
           |Listed @experimental definition was not found in the library
           |${missingInLibrary.toSeq.sorted.mkString("\n")}
           |
-          |If experimental definition was removed or stabilized, remove from the list in tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala
+          |If experimental definition was removed or stabilized, remove from the list in tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala
           |
-          |Test only: sbt "scala3-bootstrapped/testCompilation tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala"
+          |Test only: sbt "scala3-bootstrapped/testCompilation tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala"
           |""".stripMargin
         )
     }