Reorganize tests

willerf · Mar 25, 2021 · 7ffbbc7 · 7ffbbc7
1 parent 0e39cce
commit 7ffbbc7
Show file tree

Hide file tree

Showing 47 changed files with 18 additions and 58 deletions.
diff --git a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
@@ -199,6 +199,18 @@ class BootstrappedOnlyCompilationTests {
     compileFilesInDir("tests/plugins/neg").checkExpectedErrors()
     compileDir("tests/plugins/custom/analyzer", withCompilerOptions.and("-Yretain-trees")).checkCompile()
   }
+
+  // tests for experimental featuress ------------------------------------------
+
+  @Test def experimental: Unit =
+    implicit val testGroup: TestGroup = TestGroup("experimental")
+    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-staging-experimental", withStagingOptions.without("-Yno-experimental")).checkRuns()
+
 }
 
 object BootstrappedOnlyCompilationTests extends ParallelTesting {

diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -129,7 +129,6 @@ class CompilationTests {
       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")),
-      compileFilesInDir("tests/neg-custom-args/no-experimental", defaultOptions.and("-Yno-experimental")),
       compileDir("tests/neg-custom-args/impl-conv", defaultOptions.and("-Xfatal-warnings", "-feature")),
       compileFile("tests/neg-custom-args/implicit-conversions.scala", defaultOptions.and("-Xfatal-warnings", "-feature")),
       compileFile("tests/neg-custom-args/implicit-conversions-old.scala", defaultOptions.and("-Xfatal-warnings", "-feature")),
@@ -189,7 +188,7 @@ 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")),
+      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()
@@ -248,7 +247,6 @@ class CompilationTests {
     val lib =
       compileList("lib", librarySources,
         defaultOptions.and("-Ycheck-reentrant",
-          "-language:experimental.erasedDefinitions", // support declaration of scala.compiletime.erasedValue
           //  "-source", "future",  // TODO: re-enable once we allow : @unchecked in pattern definitions. Right now, lots of narrowing pattern definitions fail.
           ))(libGroup)
 

diff --git a/compiler/test/dotty/tools/vulpix/TestConfiguration.scala b/compiler/test/dotty/tools/vulpix/TestConfiguration.scala
@@ -9,6 +9,7 @@ object TestConfiguration {
   val noCheckOptions = Array(
     "-pagewidth", "120",
     "-color:never",
+    "-Yno-experimental",
     "-Xtarget", defaultTarget
   )
 

diff --git a/project/Build.scala b/project/Build.scala
@@ -246,6 +246,8 @@ object Build {
 
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
 
+    scalacOptions += "-Yno-experimental",
+
     // If someone puts a source file at the root (e.g., for manual testing),
     // don't pick it up as part of any project.
     sourcesInBase := false,
@@ -445,6 +447,8 @@ object Build {
       // Add git-hash used to package the distribution to the manifest to know it in runtime and report it in REPL
       packageOptions += ManifestAttributes(("Git-Hash", VersionUtil.gitHash)),
 
+      scalacOptions += "-Yno-experimental",
+
       javaOptions ++= {
         val managedSrcDir = {
           // Populate the directory

diff --git a/...s/BigFloat/BigFloatFromDigitsImpl_1.scala → ...l/BigFloat/BigFloatFromDigitsImpl_1.scala b/...s/BigFloat/BigFloatFromDigitsImpl_1.scala → ...l/BigFloat/BigFloatFromDigitsImpl_1.scala
diff --git a/tests/neg-macros/BigFloat/BigFloat_1.scala → ...gs/experimental/BigFloat/BigFloat_1.scala b/tests/neg-macros/BigFloat/BigFloat_1.scala → ...gs/experimental/BigFloat/BigFloat_1.scala
@@ -48,4 +48,3 @@ object BigFloat extends App {
       '{BigInt(${Expr(x.toString)})}
   }
 }
-
diff --git a/tests/neg-macros/BigFloat/Test_2.scala → ...m-args/experimental/BigFloat/Test_2.scala b/tests/neg-macros/BigFloat/Test_2.scala → ...m-args/experimental/BigFloat/Test_2.scala
diff --git a/...GenericNumLits/EvenFromDigitsImpl_1.scala → ...GenericNumLits/EvenFromDigitsImpl_1.scala b/...GenericNumLits/EvenFromDigitsImpl_1.scala → ...GenericNumLits/EvenFromDigitsImpl_1.scala
diff --git a/tests/neg-macros/GenericNumLits/Even_1.scala → .../experimental/GenericNumLits/Even_1.scala b/tests/neg-macros/GenericNumLits/Even_1.scala → .../experimental/GenericNumLits/Even_1.scala
diff --git a/tests/neg-macros/GenericNumLits/Test_2.scala → .../experimental/GenericNumLits/Test_2.scala b/tests/neg-macros/GenericNumLits/Test_2.scala → .../experimental/GenericNumLits/Test_2.scala
diff --git a/tests/neg/erased-class.scala → ...stom-args/experimental/erased-class.scala b/tests/neg/erased-class.scala → ...stom-args/experimental/erased-class.scala
diff --git a/tests/neg/erased-inheritance.scala → ...rgs/experimental/erased-inheritance.scala b/tests/neg/erased-inheritance.scala → ...rgs/experimental/erased-inheritance.scala
@@ -8,5 +8,3 @@ erased trait D
 
 val x = new A{} // ok, x is erased
 val y = new C with D{} // error
-
-
diff --git a/tests/neg/i2771.scala → .../neg-custom-args/experimental/i2771.scala b/tests/neg/i2771.scala → .../neg-custom-args/experimental/i2771.scala
diff --git a/tests/neg/i5328.scala → .../neg-custom-args/experimental/i5328.scala b/tests/neg/i5328.scala → .../neg-custom-args/experimental/i5328.scala
diff --git a/tests/neg/language-import.scala → ...m-args/experimental/language-import.scala b/tests/neg/language-import.scala → ...m-args/experimental/language-import.scala
@@ -20,4 +20,3 @@ object d:
   import language.experimental.genericNumberLiterals // ok
   import scala.language.noAutoTupling  // ok
   import _root_.scala.language.strictEquality // ok
-
diff --git a/tests/neg/namedTypeParams.scala → ...m-args/experimental/namedTypeParams.scala b/tests/neg/namedTypeParams.scala → ...m-args/experimental/namedTypeParams.scala
diff --git a/tests/neg/safeThrowsStrawman.scala → ...rgs/experimental/safeThrowsStrawman.scala b/tests/neg/safeThrowsStrawman.scala → ...rgs/experimental/safeThrowsStrawman.scala
diff --git a/tests/neg/safeThrowsStrawman2.scala → ...gs/experimental/safeThrowsStrawman2.scala b/tests/neg/safeThrowsStrawman2.scala → ...gs/experimental/safeThrowsStrawman2.scala
diff --git a/...cro-compat-no-scala3-implementation.scala → ...cro-compat-no-scala3-implementation.scala b/...cro-compat-no-scala3-implementation.scala → ...cro-compat-no-scala3-implementation.scala
diff --git a/tests/neg-with-compiler/GenericNumLits/EvenFromDigitsImpl_1.scala b/tests/neg-with-compiler/GenericNumLits/EvenFromDigitsImpl_1.scala
diff --git a/tests/neg-with-compiler/GenericNumLits/Even_1.scala b/tests/neg-with-compiler/GenericNumLits/Even_1.scala
diff --git a/tests/neg-with-compiler/GenericNumLits/Test_2.scala b/tests/neg-with-compiler/GenericNumLits/Test_2.scala
diff --git a/tests/pos/CanThrow.scala → ...s-custom-args/experimental/CanThrow.scala b/tests/pos/CanThrow.scala → ...s-custom-args/experimental/CanThrow.scala
diff --git a/tests/pos/erased-class-separate/A_1.scala → ...erimental/erased-class-separate/A_1.scala b/tests/pos/erased-class-separate/A_1.scala → ...erimental/erased-class-separate/A_1.scala
@@ -1,3 +1,2 @@
 import language.experimental.erasedDefinitions
 erased class A
-
diff --git a/tests/pos/erased-class-separate/Test_2.scala → ...mental/erased-class-separate/Test_2.scala b/tests/pos/erased-class-separate/Test_2.scala → ...mental/erased-class-separate/Test_2.scala
diff --git a/tests/pos/erased-conforms.scala → ...m-args/experimental/erased-conforms.scala b/tests/pos/erased-conforms.scala → ...m-args/experimental/erased-conforms.scala
diff --git a/tests/pos/gadt-GadtStlc.scala → ...tom-args/experimental/gadt-GadtStlc.scala b/tests/pos/gadt-GadtStlc.scala → ...tom-args/experimental/gadt-GadtStlc.scala
diff --git a/tests/pos/gadt-TypeSafeLambda.scala → ...gs/experimental/gadt-TypeSafeLambda.scala b/tests/pos/gadt-TypeSafeLambda.scala → ...gs/experimental/gadt-TypeSafeLambda.scala
diff --git a/tests/pos/i11743.scala → ...pos-custom-args/experimental/i11743.scala b/tests/pos/i11743.scala → ...pos-custom-args/experimental/i11743.scala
diff --git a/tests/pos/i3666-gadt.scala → ...custom-args/experimental/i3666-gadt.scala b/tests/pos/i3666-gadt.scala → ...custom-args/experimental/i3666-gadt.scala
diff --git a/tests/pos/i3955.scala → .../pos-custom-args/experimental/i3955.scala b/tests/pos/i3955.scala → .../pos-custom-args/experimental/i3955.scala
diff --git a/tests/pos/i5328.scala → .../pos-custom-args/experimental/i5328.scala b/tests/pos/i5328.scala → .../pos-custom-args/experimental/i5328.scala
diff --git a/tests/pos/kindPolySemiGroup.scala → ...args/experimental/kindPolySemiGroup.scala b/tests/pos/kindPolySemiGroup.scala → ...args/experimental/kindPolySemiGroup.scala
diff --git a/tests/pos/named-typeargs.scala → ...om-args/experimental/named-typeargs.scala b/tests/pos/named-typeargs.scala → ...om-args/experimental/named-typeargs.scala
diff --git a/tests/pos/namedTypeParams.scala → ...m-args/experimental/namedTypeParams.scala b/tests/pos/namedTypeParams.scala → ...m-args/experimental/namedTypeParams.scala
diff --git a/tests/pos/t1513a.scala → ...pos-custom-args/experimental/t1513a.scala b/tests/pos/t1513a.scala → ...pos-custom-args/experimental/t1513a.scala
diff --git a/tests/pos/t1513b.scala → ...pos-custom-args/experimental/t1513b.scala b/tests/pos/t1513b.scala → ...pos-custom-args/experimental/t1513b.scala
diff --git a/tests/pos/typeclass-encoding3.scala → ...gs/experimental/typeclass-encoding3.scala b/tests/pos/typeclass-encoding3.scala → ...gs/experimental/typeclass-encoding3.scala
diff --git a/...s/BigFloat/BigFloatFromDigitsImpl_1.scala → ...l/BigFloat/BigFloatFromDigitsImpl_1.scala b/...s/BigFloat/BigFloatFromDigitsImpl_1.scala → ...l/BigFloat/BigFloatFromDigitsImpl_1.scala
diff --git a/tests/run-macros/BigFloat/BigFloat_1.scala → ...gs/experimental/BigFloat/BigFloat_1.scala b/tests/run-macros/BigFloat/BigFloat_1.scala → ...gs/experimental/BigFloat/BigFloat_1.scala
@@ -48,4 +48,3 @@ object BigFloat extends App {
       '{BigInt(${Expr(x.toString)})}
   }
 }
-
diff --git a/tests/run-macros/BigFloat/Test_2.scala → ...m-args/experimental/BigFloat/Test_2.scala b/tests/run-macros/BigFloat/Test_2.scala → ...m-args/experimental/BigFloat/Test_2.scala
diff --git a/tests/run/genericNumLits.scala → ...om-args/experimental/genericNumLits.scala b/tests/run/genericNumLits.scala → ...om-args/experimental/genericNumLits.scala
diff --git a/tests/run/hmap-covariant.scala → ...om-args/experimental/hmap-covariant.scala b/tests/run/hmap-covariant.scala → ...om-args/experimental/hmap-covariant.scala
diff --git a/tests/run/hmap.scala → ...s/run-custom-args/experimental/hmap.scala b/tests/run/hmap.scala → ...s/run-custom-args/experimental/hmap.scala
diff --git a/tests/run/polymorphic-functions.scala → .../experimental/polymorphic-functions.scala b/tests/run/polymorphic-functions.scala → .../experimental/polymorphic-functions.scala
diff --git a/tests/run/safeThrowsStrawman.scala → ...rgs/experimental/safeThrowsStrawman.scala b/tests/run/safeThrowsStrawman.scala → ...rgs/experimental/safeThrowsStrawman.scala
diff --git a/tests/run-staging/staged-streams_1.scala → ...aging-experimental/staged-streams_1.scala b/tests/run-staging/staged-streams_1.scala → ...aging-experimental/staged-streams_1.scala
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,4 +48,3 @@ object BigFloat extends App {
		'{BigInt(${Expr(x.toString)})}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,5 +8,3 @@ erased trait D

		val x = new A{} // ok, x is erased
		val y = new C with D{} // error
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,3 @@ object d:
		import language.experimental.genericNumberLiterals // ok
		import scala.language.noAutoTupling // ok
		import _root_.scala.language.strictEquality // ok
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		import language.experimental.erasedDefinitions
		erased class A