Simplify macro tests with custom args

Author: nicolasstucki

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,15 +119,9 @@ 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")

tests/pos-macros/i9570.scala tests/neg-macros/i9570.scalatests/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 tests/neg-macros/macro-deprecation.scalatests/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 tests/neg-macros/macro-experimental.scalatests/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 tests/neg/i9685bis.checktests/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 tests/neg/i9685bis.scalatests/neg-inlines-strict/i9685bis.scala renamed to tests/neg/i9685bis.scala

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