Fix CI

Author: liufengyun

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

@@ -118,7 +118,6 @@ class BootstrappedOnlyCompilationTests {
     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/run-macros-erased", defaultOptions.and("-language:experimental.erasedDefinitions").and("-Xcheck-macros")),
     )
   }.checkRuns()
 
@@ -204,12 +203,18 @@ class BootstrappedOnlyCompilationTests {
 
   @Test def experimental: Unit =
     implicit val testGroup: TestGroup = TestGroup("experimental")
+    val enableExperimental = defaultOptions.without("-Yno-experimental")
+    val enableErased = enableExperimental.and("-language:experimental.erasedDefinitions")
     compileFilesInDir("tests/neg-custom-args/no-experimental", defaultOptions.and("-Yno-experimental")).checkExpectedErrors()
     if config.Properties.experimental then
-      compileFilesInDir("tests/run-custom-args/experimental", defaultOptions.without("-Yno-experimental")).checkRuns()
-      compileFilesInDir("tests/neg-custom-args/experimental", defaultOptions.without("-Yno-experimental")).checkExpectedErrors()
-      compileFilesInDir("tests/pos-custom-args/experimental", defaultOptions.without("-Yno-experimental")).checkCompile()
+      compileFilesInDir("tests/run-custom-args/experimental", enableExperimental).checkRuns()
+      compileFilesInDir("tests/neg-custom-args/experimental", enableExperimental).checkExpectedErrors()
+      compileFilesInDir("tests/pos-custom-args/experimental", enableExperimental).checkCompile()
       compileFilesInDir("tests/run-staging-experimental", withStagingOptions.without("-Yno-experimental")).checkRuns()
+      compileFilesInDir("tests/neg-custom-args/erased", enableErased).checkExpectedErrors()
+      compileFilesInDir("tests/pos-custom-args/erased", enableErased).checkCompile()
+      compileFilesInDir("tests/run-custom-args/run-macros-erased", enableErased.and("-Xcheck-macros")).checkRuns()
+      compileFilesInDir("tests/run-custom-args/erased", enableErased)
 
 }
 

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

@@ -39,7 +39,6 @@ class CompilationTests {
       compileFilesInDir("tests/pos-special/isInstanceOf", allowDeepSubtypes.and("-Xfatal-warnings")),
       compileFilesInDir("tests/new", defaultOptions),
       compileFilesInDir("tests/pos-scala2", scala2CompatMode),
-      compileFilesInDir("tests/pos-custom-args/erased", defaultOptions.and("-language:experimental.erasedDefinitions")),
       compileFilesInDir("tests/pos", defaultOptions.and("-Ysafe-init")),
       compileFilesInDir("tests/pos-deep-subtype", allowDeepSubtypes),
       compileDir("tests/pos-special/java-param-names", defaultOptions.withJavacOnlyOptions("-parameters")),
@@ -125,7 +124,6 @@ class CompilationTests {
       compileFilesInDir("tests/neg-no-kind-polymorphism", defaultOptions and "-Yno-kind-polymorphism"),
       compileFilesInDir("tests/neg-custom-args/deprecation", defaultOptions.and("-Xfatal-warnings", "-deprecation")),
       compileFilesInDir("tests/neg-custom-args/fatal-warnings", defaultOptions.and("-Xfatal-warnings")),
-      compileFilesInDir("tests/neg-custom-args/erased", defaultOptions.and("-language:experimental.erasedDefinitions")),
       compileFilesInDir("tests/neg-custom-args/allow-double-bindings", allowDoubleBindings),
       compileFilesInDir("tests/neg-custom-args/allow-deep-subtypes", allowDeepSubtypes),
       compileFilesInDir("tests/neg-custom-args/explicit-nulls", defaultOptions.and("-Yexplicit-nulls")),
@@ -164,9 +162,7 @@ class CompilationTests {
       compileDir("tests/neg-custom-args/adhoc-extension", defaultOptions.and("-source", "future", "-feature", "-Xfatal-warnings")),
       compileFile("tests/neg/i7575.scala", defaultOptions.withoutLanguageFeatures.and("-language:_")),
       compileFile("tests/neg-custom-args/kind-projector.scala", defaultOptions.and("-Ykind-projector")),
-      compileFile("tests/neg-custom-args/typeclass-derivation2.scala", defaultOptions.and("-language:experimental.erasedDefinitions")),
       compileFile("tests/neg-custom-args/i5498-postfixOps.scala", defaultOptions withoutLanguageFeature "postfixOps"),
-      compileFile("tests/neg-custom-args/deptypes.scala", defaultOptions.and("-language:experimental.dependent")),
       compileFile("tests/neg-custom-args/matchable.scala", defaultOptions.and("-Xfatal-warnings", "-source", "future")),
       compileFile("tests/neg-custom-args/i7314.scala", defaultOptions.and("-Xfatal-warnings", "-source", "future")),
       compileFile("tests/neg-custom-args/feature-shadowing.scala", defaultOptions.and("-Xfatal-warnings", "-feature")),
@@ -188,7 +184,6 @@ class CompilationTests {
       compileFile("tests/run-custom-args/fors.scala", defaultOptions.and("-source", "future")),
       compileFile("tests/run-custom-args/no-useless-forwarders.scala", defaultOptions and "-Xmixin-force-forwarders:false"),
       compileFile("tests/run-custom-args/defaults-serizaliable-no-forwarders.scala", defaultOptions and "-Xmixin-force-forwarders:false"),
-      compileFilesInDir("tests/run-custom-args/erased", defaultOptions.and("-language:experimental.erasedDefinitions").without("-Yno-experimental")),
       compileFilesInDir("tests/run-deep-subtype", allowDeepSubtypes),
       compileFilesInDir("tests/run", defaultOptions.and("-Ysafe-init"))
     ).checkRuns()

tests/neg-custom-args/typeclass-derivation2.scala renamed to tests/neg-custom-args/erased/typeclass-derivation2.scala

@@ -1,3 +1,5 @@
+import language.experimental.erasedDefinitions
+
 import scala.collection.mutable
 import scala.annotation.tailrec
 

tests/neg-custom-args/deptypes.scala renamed to tests/neg-custom-args/experimental/deptypes.scala

@@ -1,3 +1,4 @@
+import language.experimental.dependent
 
 type Vec[T] = (n: Int) =>> Array[T] // error: not yet implemented