scala · Kordyjan · Dec 8, 2023 · Dec 1, 2023 · Dec 1, 2023 · Aug 9, 2023
diff --git a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala b/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,12 +103,8 @@ class BootstrappedOnlyCompilationTests {
 
   @Test def negMacros: Unit = {
     implicit val testGroup: TestGroup = TestGroup("compileNegWithCompiler")
-    aggregateTests(
-      compileFilesInDir("tests/neg-macros", defaultOptions.and("-Xcheck-macros")),
-      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 = {
@@ -127,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()
   }

diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -50,7 +50,6 @@ class CompilationTests {
       compileFilesInDir("tests/pos-custom-args/no-experimental", defaultOptions.and("-Yno-experimental")),
       compileFilesInDir("tests/pos-custom-args/strict", defaultOptions.and("-source", "future", "-deprecation", "-Xfatal-warnings")),
       compileDir("tests/pos-special/java-param-names", defaultOptions.withJavacOnlyOptions("-parameters")),
-      compileDir("tests/pos-special/stdlib", defaultOptions),
       compileFile(
         // succeeds despite -Xfatal-warnings because of -nowarn
         "tests/neg-custom-args/fatal-warnings/xfatalWarnings.scala",

diff --git a/tests/pos-macros/i9570.scala → tests/neg-macros/i9570.scala b/tests/pos-macros/i9570.scala → tests/neg-macros/i9570.scala
@@ -1,3 +1,5 @@
+// scalac: -Xfatal-warnings
+
 import scala.quoted.*
 
 object Macros {

diff --git a/tests/pos-macros/macro-deprecation.scala → tests/neg-macros/macro-deprecation.scala b/tests/pos-macros/macro-deprecation.scala → tests/neg-macros/macro-deprecation.scala
@@ -1,3 +1,5 @@
+// scalac: -Xfatal-warnings -deprecation
+
 import scala.quoted.*
 
 inline def f = ${ impl } // error

diff --git a/tests/pos-macros/macro-experimental.scala → tests/neg-macros/macro-experimental.scala b/tests/pos-macros/macro-experimental.scala → tests/neg-macros/macro-experimental.scala
@@ -1,3 +1,5 @@
+// scalac: -Yno-experimental
+
 import scala.quoted.*
 import scala.annotation.experimental
 

diff --git a/...s/tasty-interpreter/InterpretedMain.scala → ...terpreter-prototype/InterpretedMain.scala b/...s/tasty-interpreter/InterpretedMain.scala → ...terpreter-prototype/InterpretedMain.scala
diff --git a/...-args/tasty-interpreter/Precompiled.scala → ...y-interpreter-prototype/Precompiled.scala b/...-args/tasty-interpreter/Precompiled.scala → ...y-interpreter-prototype/Precompiled.scala
diff --git a/...-custom-args/tasty-interpreter/Test.scala → ...ld-tasty-interpreter-prototype/Test.scala b/...-custom-args/tasty-interpreter/Test.scala → ...ld-tasty-interpreter-prototype/Test.scala
diff --git a/...preter/interpreter/TastyInterpreter.scala → ...totype/interpreter/TastyInterpreter.scala b/...preter/interpreter/TastyInterpreter.scala → ...totype/interpreter/TastyInterpreter.scala
diff --git a/...rpreter/interpreter/TreeInterpreter.scala → ...ototype/interpreter/TreeInterpreter.scala b/...rpreter/interpreter/TreeInterpreter.scala → ...ototype/interpreter/TreeInterpreter.scala
diff --git a/...rpreter/interpreter/jvm/Interpreter.scala → ...ototype/interpreter/jvm/Interpreter.scala b/...rpreter/interpreter/jvm/Interpreter.scala → ...ototype/interpreter/jvm/Interpreter.scala
diff --git a/...reter/interpreter/jvm/JVMReflection.scala → ...otype/interpreter/jvm/JVMReflection.scala b/...reter/interpreter/jvm/JVMReflection.scala → ...otype/interpreter/jvm/JVMReflection.scala
diff --git a/...un-custom-args/tasty-interpreter/notes.md → .../old-tasty-interpreter-prototype/notes.md b/...un-custom-args/tasty-interpreter/notes.md → .../old-tasty-interpreter-prototype/notes.md
diff --git a/tests/pos-custom-args/i13405/Test.scala b/tests/pos-custom-args/i13405/Test.scala
diff --git a/tests/pos-special/i11331.1/Macro_1.scala → tests/pos-macros/i11331a/Macro_1.scala b/tests/pos-special/i11331.1/Macro_1.scala → tests/pos-macros/i11331a/Macro_1.scala
diff --git a/tests/pos-special/i11331.1/Test_2.scala → tests/pos-macros/i11331a/Test_2.scala b/tests/pos-special/i11331.1/Test_2.scala → tests/pos-macros/i11331a/Test_2.scala
diff --git a/tests/pos-custom-args/i13405/Macro.scala → tests/pos-macros/i13405/Macro.scala b/tests/pos-custom-args/i13405/Macro.scala → tests/pos-macros/i13405/Macro.scala
diff --git a/tests/pos-macros/i13405/Test.scala b/tests/pos-macros/i13405/Test.scala
@@ -0,0 +1,3 @@
+// scalac: -Xfatal-warnings
+
+@main def main: Unit = hh()
diff --git a/tests/pos-special/i7592/Macros_1.scala → tests/pos-macros/i7592/Macros_1.scala b/tests/pos-special/i7592/Macros_1.scala → tests/pos-macros/i7592/Macros_1.scala
diff --git a/tests/pos-special/i7592/Test_2.scala → tests/pos-macros/i7592/Test_2.scala b/tests/pos-special/i7592/Test_2.scala → tests/pos-macros/i7592/Test_2.scala
@@ -1,3 +1,5 @@
+// scalac: -Yretain-trees
+
 def return1 = 1
 
 def testReturn1 = {

diff --git a/...rgs/semanticdb/inline-unapply/App_2.scala → ...ros/semanticdb-inline-unapply/App_2.scala b/...rgs/semanticdb/inline-unapply/App_2.scala → ...ros/semanticdb-inline-unapply/App_2.scala
@@ -1,3 +1,4 @@
+// scalac: -Xsemanticdb
 
 object Test {
   def main(args: Array[String]): Unit = {

diff --git a/...s/semanticdb/inline-unapply/Macro_1.scala → ...s/semanticdb-inline-unapply/Macro_1.scala b/...s/semanticdb/inline-unapply/Macro_1.scala → ...s/semanticdb-inline-unapply/Macro_1.scala
@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import scala.quoted.*
 
 object Succ:

diff --git a/...args/semanticdb/macro-pos/example_1.scala → ...cros/semanticdb-macro-pos/example_1.scala b/...args/semanticdb/macro-pos/example_1.scala → ...cros/semanticdb-macro-pos/example_1.scala
@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import quoted.*
 
 object CodeImpl {

diff --git a/...args/semanticdb/macro-pos/example_2.scala → ...cros/semanticdb-macro-pos/example_2.scala b/...args/semanticdb/macro-pos/example_2.scala → ...cros/semanticdb-macro-pos/example_2.scala
@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import quoted.*
 
 object TestImpl {

diff --git a/...args/semanticdb/macro-pos/example_3.scala → ...cros/semanticdb-macro-pos/example_3.scala b/...args/semanticdb/macro-pos/example_3.scala → ...cros/semanticdb-macro-pos/example_3.scala
@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 object Test {
 
   def test = TestImpl.fun("")

diff --git a/tests/pos-special/stdlib/Test1.scala b/tests/pos-special/stdlib/Test1.scala
diff --git a/tests/pos-special/stdlib/Test2.scala b/tests/pos-special/stdlib/Test2.scala
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// scalac: -Xfatal-warnings

		@main def main: Unit = hh()