Use //> using directive in compilation tests

* Set options with `//> using`
* Put together tests that need deep subtypes
* -Ycheck tests/run/typeclass-derivation1.scala

Author: nicolasstucki

compiler/test/dotc/pos-test-pickling.blacklist

@@ -23,6 +23,10 @@ t5031_2.scala
 i16997.scala
 i7414.scala
 i17588.scala
+i9804.scala
+i13433.scala
+i16649-irrefutable.scala
+strict-pattern-bindings-3.0-migration.scala
 
 # Tree is huge and blows stack for printing Text
 i7034.scala

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

@@ -30,22 +30,16 @@ class CompilationTests {
   @Test def pos: Unit = {
     implicit val testGroup: TestGroup = TestGroup("compilePos")
     var tests = List(
-      compileFile("tests/pos/nullarify.scala", defaultOptions.and("-Ycheck:nullarify")),
-      compileFile("tests/pos-special/utf8encoded.scala", explicitUTF8),
-      compileFile("tests/pos-special/utf16encoded.scala", explicitUTF16),
+      compileFilesInDir("tests/pos", defaultOptions.and("-Ysafe-init")),
+      compileFilesInDir("tests/pos-deep-subtype", allowDeepSubtypes),
       compileFilesInDir("tests/pos-special/sourcepath/outer", defaultOptions.and("-sourcepath", "tests/pos-special/sourcepath")),
       compileFile("tests/pos-special/sourcepath/outer/nested/Test4.scala", defaultOptions.and("-sourcepath", "tests/pos-special/sourcepath")),
-      compileFilesInDir("tests/pos-special/fatal-warnings", defaultOptions.and("-Xfatal-warnings", "-deprecation", "-feature")),
-      compileFilesInDir("tests/pos-special/spec-t5545", defaultOptions),
-      compileFilesInDir("tests/pos-special/strawman-collections", allowDeepSubtypes),
-      compileFilesInDir("tests/pos-special/isInstanceOf", allowDeepSubtypes.and("-Xfatal-warnings")),
-      compileFilesInDir("tests/new", defaultOptions.and("-source", "3.2")), // just to see whether 3.2 works
-      compileFilesInDir("tests/pos-scala2", scala2CompatMode),
+      compileFilesInDir("tests/pos-scala2", defaultOptions.and("-source", "3.0-migration")),
       compileFilesInDir("tests/pos-custom-args/captures", defaultOptions.and("-language:experimental.captureChecking")),
-      compileFilesInDir("tests/pos", defaultOptions.and("-Ysafe-init")),
+      compileFile("tests/pos-special/utf8encoded.scala", defaultOptions.and("-encoding", "UTF8")),
+      compileFile("tests/pos-special/utf16encoded.scala", defaultOptions.and("-encoding", "UTF16")),
       // Run tests for legacy lazy vals
       compileFilesInDir("tests/pos", defaultOptions.and("-Ysafe-init", "-Ylegacy-lazy-vals", "-Ycheck-constraint-deps"), FileFilter.include(TestSources.posLazyValsAllowlist)),
-      compileFilesInDir("tests/pos-deep-subtype", allowDeepSubtypes),
       compileDir("tests/pos-special/java-param-names", defaultOptions.withJavacOnlyOptions("-parameters")),
       compileDir("tests/pos-special/stdlib", defaultOptions),
     )
@@ -60,7 +54,7 @@ class CompilationTests {
     implicit val testGroup: TestGroup = TestGroup("rewrites")
 
     aggregateTests(
-      compileFile("tests/rewrites/rewrites.scala", scala2CompatMode.and("-rewrite", "-indent")),
+      compileFile("tests/rewrites/rewrites.scala", defaultOptions.and("-source", "3.0-migration").and("-rewrite", "-indent")),
       compileFile("tests/rewrites/rewrites3x.scala", defaultOptions.and("-rewrite", "-source", "future-migration")),
       compileFile("tests/rewrites/rewrites3x-fatal-warnings.scala", defaultOptions.and("-rewrite", "-source", "future-migration", "-Xfatal-warnings")),
       compileFile("tests/rewrites/filtering-fors.scala", defaultOptions.and("-rewrite", "-source", "3.2-migration")),
@@ -121,27 +115,14 @@ class CompilationTests {
     implicit val testGroup: TestGroup = TestGroup("compileNeg")
     aggregateTests(
       compileFilesInDir("tests/neg", defaultOptions),
-      compileFilesInDir("tests/neg-tailcall", defaultOptions),
-      compileFilesInDir("tests/neg-strict", defaultOptions.and("-source", "future", "-deprecation", "-Xfatal-warnings")),
-      compileFilesInDir("tests/neg-custom-args/allow-double-bindings", allowDoubleBindings),
-      compileFilesInDir("tests/neg-custom-args/allow-deep-subtypes", allowDeepSubtypes),
+      compileFilesInDir("tests/neg-deep-subtype", allowDeepSubtypes),
       compileFilesInDir("tests/neg-custom-args/captures", defaultOptions.and("-language:experimental.captureChecking")),
-      compileFile("tests/neg-custom-args/i1650.scala", allowDeepSubtypes),
-      compileFile("tests/neg-custom-args/i3882.scala", allowDeepSubtypes),
-      compileFile("tests/neg-custom-args/i4372.scala", allowDeepSubtypes),
-      compileFile("tests/neg-custom-args/i1754.scala", allowDeepSubtypes),
-      compileFile("tests/neg-custom-args/i12650.scala", allowDeepSubtypes),
-      compileFile("tests/neg-custom-args/interop-polytypes.scala", allowDeepSubtypes.and("-Yexplicit-nulls")),
-      compileFile("tests/neg-custom-args/conditionalWarnings.scala", allowDeepSubtypes.and("-deprecation").and("-Xfatal-warnings")),
-      compileFilesInDir("tests/neg-custom-args/isInstanceOf", allowDeepSubtypes and "-Xfatal-warnings"),
-      compileFile("tests/neg-custom-args/i3627.scala", allowDeepSubtypes),
       compileFile("tests/neg-custom-args/sourcepath/outer/nested/Test1.scala", defaultOptions.and("-sourcepath", "tests/neg-custom-args/sourcepath")),
       compileDir("tests/neg-custom-args/sourcepath2/hi", defaultOptions.and("-sourcepath", "tests/neg-custom-args/sourcepath2", "-Xfatal-warnings")),
       compileList("duplicate source", List(
         "tests/neg-custom-args/toplevel-samesource/S.scala",
         "tests/neg-custom-args/toplevel-samesource/nested/S.scala"),
         defaultOptions),
-      compileFile("tests/neg-custom-args/i6300.scala", allowDeepSubtypes),
       compileFile("tests/neg/i7575.scala", defaultOptions.withoutLanguageFeatures.and("-language:_")),
     ).checkExpectedErrors()
   }
@@ -156,12 +137,9 @@ class CompilationTests {
   @Test def runAll: Unit = {
     implicit val testGroup: TestGroup = TestGroup("runAll")
     aggregateTests(
-      compileFile("tests/run-custom-args/typeclass-derivation1.scala", defaultOptions.without(yCheckOptions*)),
-      compileFile("tests/run-custom-args/tuple-cons.scala", allowDeepSubtypes),
-      compileFile("tests/run-custom-args/i5256.scala", allowDeepSubtypes),
-      compileFilesInDir("tests/run-custom-args/captures", allowDeepSubtypes.and("-language:experimental.captureChecking")),
-      compileFilesInDir("tests/run-deep-subtype", allowDeepSubtypes),
       compileFilesInDir("tests/run", defaultOptions.and("-Ysafe-init")),
+      compileFilesInDir("tests/run-deep-subtype", allowDeepSubtypes),
+      compileFilesInDir("tests/run-custom-args/captures", allowDeepSubtypes.and("-language:experimental.captureChecking")),
       // Run tests for legacy lazy vals.
       compileFilesInDir("tests/run", defaultOptions.and("-Ysafe-init", "-Ylegacy-lazy-vals", "-Ycheck-constraint-deps"), FileFilter.include(TestSources.runLazyValsAllowlist)),
     ).checkRuns()
@@ -179,7 +157,6 @@ class CompilationTests {
   @Test def pickling: Unit = {
     implicit val testGroup: TestGroup = TestGroup("testPickling")
     aggregateTests(
-      compileFilesInDir("tests/new", picklingOptions),
       compileFilesInDir("tests/pos", picklingOptions, FileFilter.exclude(TestSources.posTestPicklingBlacklisted)),
       compileFilesInDir("tests/run", picklingOptions, FileFilter.exclude(TestSources.runTestPicklingBlacklisted))
     ).checkCompile()
@@ -189,8 +166,7 @@ class CompilationTests {
   def recheck: Unit =
     given TestGroup = TestGroup("recheck")
     aggregateTests(
-      compileFilesInDir("tests/new", recheckOptions),
-      compileFilesInDir("tests/run", recheckOptions, FileFilter.exclude(TestSources.runTestRecheckExcluded))
+      compileFilesInDir("tests/run", defaultOptions.and("-Yrecheck-test"), FileFilter.exclude(TestSources.runTestRecheckExcluded))
       //Disabled to save some time.
       //compileFilesInDir("tests/pos", recheckOptions, FileFilter.exclude(TestSources.posTestRecheckExcluded)),
     ).checkCompile()
@@ -199,22 +175,22 @@ class CompilationTests {
   @Test def explicitNullsNeg: Unit = {
     implicit val testGroup: TestGroup = TestGroup("explicitNullsNeg")
     aggregateTests(
-      compileFilesInDir("tests/explicit-nulls/neg", explicitNullsOptions),
-      compileFilesInDir("tests/explicit-nulls/unsafe-common", explicitNullsOptions),
+      compileFilesInDir("tests/explicit-nulls/neg", defaultOptions and "-Yexplicit-nulls"),
+      compileFilesInDir("tests/explicit-nulls/unsafe-common", defaultOptions and "-Yexplicit-nulls"),
     )
   }.checkExpectedErrors()
 
   @Test def explicitNullsPos: Unit = {
     implicit val testGroup: TestGroup = TestGroup("explicitNullsPos")
     aggregateTests(
-      compileFilesInDir("tests/explicit-nulls/pos", explicitNullsOptions),
-      compileFilesInDir("tests/explicit-nulls/unsafe-common", explicitNullsOptions and "-language:unsafeNulls"),
+      compileFilesInDir("tests/explicit-nulls/pos", defaultOptions and "-Yexplicit-nulls"),
+      compileFilesInDir("tests/explicit-nulls/unsafe-common", defaultOptions and "-Yexplicit-nulls" and "-language:unsafeNulls"),
     )
   }.checkCompile()
 
   @Test def explicitNullsRun: Unit = {
     implicit val testGroup: TestGroup = TestGroup("explicitNullsRun")
-    compileFilesInDir("tests/explicit-nulls/run", explicitNullsOptions)
+    compileFilesInDir("tests/explicit-nulls/run", defaultOptions and "-Yexplicit-nulls")
   }.checkRuns()
 
   // initialization tests

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

@@ -84,13 +84,6 @@ object TestConfiguration {
   )
   val picklingWithCompilerOptions =
     picklingOptions.withClasspath(withCompilerClasspath).withRunClasspath(withCompilerClasspath)
-  val recheckOptions = defaultOptions.and("-Yrecheck-test")
-  val scala2CompatMode = defaultOptions.and("-source", "3.0-migration")
-  val explicitUTF8 = defaultOptions and ("-encoding", "UTF8")
-  val explicitUTF16 = defaultOptions and ("-encoding", "UTF16")
-
-  /** Enables explicit nulls */
-  val explicitNullsOptions = defaultOptions and "-Yexplicit-nulls"
 
   /** Default target of the generated class files */
   private def defaultTarget: String = {

tests/neg-custom-args/isInstanceOf/1828.scala renamed to tests/neg-deep-subtype/1828.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class Test {
   def remove[S](a: S | Int, f: Int => S):S = a match {
     case a: S => a             // error

tests/neg-custom-args/isInstanceOf/3324b.scala renamed to tests/neg-deep-subtype/3324b.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class C[T] {
   val x: Any = ???
   if (x.isInstanceOf[List[String]]) // error: unchecked

tests/neg-custom-args/isInstanceOf/3324f.scala renamed to tests/neg-deep-subtype/3324f.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 trait C[T]
 class D[T]
 

tests/neg-custom-args/isInstanceOf/3324g.scala renamed to tests/neg-deep-subtype/3324g.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class Test {
   trait A[+T]
   class B[T] extends A[T]

tests/neg-custom-args/isInstanceOf/4075.scala.ignore renamed to tests/neg-deep-subtype/4075.scala.ignore

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 object Test {
   trait Foo
   case class One[+T](fst: T)

tests/neg-custom-args/isInstanceOf/JavaSeqLiteral.scala renamed to tests/neg-deep-subtype/JavaSeqLiteral.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 object Test1 {
   trait Tree[-T]
 

tests/neg-custom-args/conditionalWarnings.scala renamed to tests/neg-deep-subtype/conditionalWarnings.scala

@@ -1,5 +1,5 @@
+//> using options -deprecation -Xfatal-warnings
 
-// run with -deprecation -Xfatal-warnings
 object Test {
   @deprecated def foo = ???
 

tests/neg-custom-args/isInstanceOf/enum-approx2.scala renamed to tests/neg-deep-subtype/enum-approx2.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 sealed trait Exp[T]
 case class Fun[A, B](f: Exp[A => B]) extends Exp[A => B]
 

tests/neg-custom-args/isInstanceOf/gadt.scala renamed to tests/neg-deep-subtype/gadt.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class Test {
   trait A[+T]
   class B[T] extends A[T]

tests/neg-custom-args/isInstanceOf/html.scala renamed to tests/neg-deep-subtype/html.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 object HTML:
   type AttrArg = AppliedAttr | Seq[AppliedAttr]
   opaque type AppliedAttr = String

tests/neg-custom-args/allow-deep-subtypes/i11064.scala renamed to tests/neg-deep-subtype/i11064.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 trait Box[+T]
 case class Foo[+S](s: S) extends Box[S]
 

tests/neg-custom-args/isInstanceOf/i11178.scala renamed to tests/neg-deep-subtype/i11178.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 import scala.collection.mutable
 
 object Test:

tests/neg-custom-args/allow-double-bindings/i1240.scala renamed to tests/neg-deep-subtype/i1240.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class Foo {
   def foo(x: Any): Boolean =
     x.isInstanceOf[List[String]]  // error

tests/neg-custom-args/i12650.scala renamed to tests/neg-deep-subtype/i12650.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class Test {
   def test[X <: Option[Int]](x: X) = x.isInstanceOf[Some[Int]]
   def test1[Y <: Int, X <: Option[Y]](x: X) = x.isInstanceOf[Some[Int]]

tests/neg-custom-args/i1650.scala renamed to tests/neg-deep-subtype/i1650.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class A
 class B
 

tests/neg-custom-args/isInstanceOf/i17435.scala renamed to tests/neg-deep-subtype/i17435.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class Foo {
   def test[A]: (List[Int] | A) => Int = {
     case ls: List[Int] => ls.head       // error, A = List[String]

tests/neg-custom-args/i1754.scala renamed to tests/neg-deep-subtype/i1754.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class Foo {
   def test1[A]: List[Int] | A => Int = {
     case ls: List[_] => ls.head       // error

tests/neg-custom-args/allow-double-bindings/i2002.scala renamed to tests/neg-deep-subtype/i2002.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 sealed trait Foo[+A]
 case class Bar[A]() extends Foo[A]
 

tests/neg-custom-args/isInstanceOf/i3324.scala renamed to tests/neg-deep-subtype/i3324.scala

@@ -1,3 +1,5 @@
+//> using options -Yexplicit-nulls
+
 class Foo {
   import java.util.ArrayList
   // Test that return values in PolyTypes are marked as nullable.

tests/neg-custom-args/i3627.scala renamed to tests/neg-deep-subtype/i3627.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 object Test1 {
   trait Tree
   trait Context

tests/neg-custom-args/i3882.scala renamed to tests/neg-deep-subtype/i3882.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class A[-T]
 class B[T] extends A[T]
 

tests/neg-custom-args/isInstanceOf/i4297.scala renamed to tests/neg-deep-subtype/i4297.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class A
 class B extends A
 type AA = A { type T = Int }

tests/neg-custom-args/i4372.scala renamed to tests/neg-deep-subtype/i4372.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 // Test cases: the only place we can cut and paste without crying
 // ourself to sleep.
 object Test {

tests/neg-custom-args/isInstanceOf/i5495.scala renamed to tests/neg-deep-subtype/i5495.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 trait A[T]
 trait B[T] extends A[T]
 

tests/neg-custom-args/isInstanceOf/i5826.scala renamed to tests/neg-deep-subtype/i5826.scala

@@ -1,3 +1,5 @@
+//> using options -source future -deprecation -Xfatal-warnings
+
 trait A:
   def f: Int
 

tests/neg-custom-args/isInstanceOf/i5826b.scala renamed to tests/neg-deep-subtype/i5826b.scala

@@ -1,3 +1,5 @@
+//> using options -source future -deprecation -Xfatal-warnings
+
 // i1050 checks failing at posttyper
 trait A { type L <: Nothing }
 trait B { type L >: Any}

tests/neg-custom-args/allow-deep-subtypes/i5877.scala renamed to tests/neg-deep-subtype/i5877.scala

@@ -1,3 +1,5 @@
+//> using options -source future -deprecation -Xfatal-warnings
+
 import compiletime.uninitialized
 
 class Memo[A](x: => A):

tests/neg-custom-args/i6300.scala renamed to tests/neg-deep-subtype/i6300.scala

@@ -1,3 +1,5 @@
+//> using options -source future -deprecation -Xfatal-warnings
+
 package deptest {
   @deprecated("Not used any more", since="7")
   object DeprecatedThing {

tests/neg-custom-args/allow-deep-subtypes/i8464a.scala renamed to tests/neg-deep-subtype/i8464a.scala

@@ -1,3 +1,5 @@
+//> using options -source future -deprecation -Xfatal-warnings
+
 trait X {
   type T
   def process(t: T): Unit

tests/neg-custom-args/isInstanceOf/i8932.scala renamed to tests/neg-deep-subtype/i8932.scala

@@ -1,3 +1,5 @@
+//> using options -source future -deprecation -Xfatal-warnings
+
 object bar {
   trait Sub {
     type M

tests/neg-custom-args/allow-deep-subtypes/i9325.scala renamed to tests/neg-deep-subtype/i9325.scala

@@ -1,3 +1,5 @@
+//> using options -source future -deprecation -Xfatal-warnings
+
 object nullless {
   trait LowerBound[T] {
     type M >: T;

tests/neg-custom-args/interop-polytypes.scala renamed to tests/neg-deep-subtype/interop-polytypes.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 sealed trait A[T]
 class B[T] extends A[T]
 

tests/neg-custom-args/allow-deep-subtypes/matchtype-loop2.scala renamed to tests/neg-deep-subtype/matchtype-loop2.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class Test {
   val x: Any = ???
 

tests/neg-custom-args/isInstanceOf/or-type-trees.scala renamed to tests/neg-deep-subtype/or-type-trees.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class C[T] {
   val x: T = ???
   x.isInstanceOf[T]

tests/neg-custom-args/allow-double-bindings/overloadsOnAbstractTypes.scala renamed to tests/neg-deep-subtype/overloadsOnAbstractTypes.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 object Test {
   trait Marker
   def foo[T](x: T) = x match {

tests/neg-custom-args/isInstanceOf/patmat-applied.scala renamed to tests/neg-deep-subtype/patmat-applied.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 object p {
 
   // test parametric case classes, which synthesis `canEqual` and `equals`

tests/neg-custom-args/isInstanceOf/refined-types.scala renamed to tests/neg-deep-subtype/refined-types.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 import scala.reflect.ClassTag
 
 object IsInstanceOfClassTag {

tests/neg-custom-args/isInstanceOf/t2755.scala renamed to tests/neg-deep-subtype/t2755.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 sealed trait Exp[T]
 case class Num(n: Int) extends Exp[Int]
 case class Plus(e1: Exp[Int], e2: Exp[Int]) extends Exp[Int]

tests/neg-custom-args/allow-double-bindings/test-typers.scala renamed to tests/neg-deep-subtype/test-typers.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 sealed trait Unset
 
 def foo(v: Unset|Option[Int]): Unit = v match

tests/neg-custom-args/isInstanceOf/type-lambda.scala renamed to tests/neg-deep-subtype/type-lambda.scala

@@ -1,3 +1,5 @@
+//> using options -Xfatal-warnings
+
 class Test {
   type MyCombo = Int | Unit
   val z: MyCombo = 10