Add Scala 2 library TASTy test blacklist

Author: nicolasstucki

compiler/test/dotc/scala2-library-tasty.blacklist

@@ -0,0 +1,40 @@
+### tests/run
+typeclass-derivation3.scala # `::.next` vs `::.next$accessor$1`
+typelevel-peano.scala # failure to reduce inline match (fix in #18874)
+
+## tests/run-macros
+tasty-extractors-2
+tasty-extractors-1
+tasty-extractors-types
+Xmacro-settings-compileTimeEnv # failure to reduce inline match
+
+### tests/pos
+i13161.scala # failure to reduce inline match
+not-looping-implicit.scala # failure to reduce inline match
+
+## tests/neg
+constructor-proxy-shadowing.scala
+i8752.scala
+f-interpolator-neg.scala # Additional: A pure expression does nothing in statement position
+
+## (#18882) tests/init-global/neg
+unapplySeq-implicit-arg3.scala
+t9312.scala
+unapplySeq-implicit-arg2.scala
+unapplySeq-implicit-arg.scala
+
+## (#18882) tests/init-global/pos
+patmat.scala
+patmat-interpolator.scala
+unapplySeq-implicit-arg-pos.scala
+global-cycle11.scala
+
+## tests/patmat
+t7746.scala # order of exhaustivity suggestions differs
+t4408.scala # order of exhaustivity suggestions differs
+patmat-ortype.scala # order of exhaustivity suggestions differs
+i13003.scala # order of exhaustivity suggestions differs
+
+## Other issues
+# - CompilationTests.pos: tests/pos-special/stdlib
+# - CoverageTests.checkInstrumentedRuns

compiler/test/dotty/Properties.scala

@@ -85,6 +85,9 @@ object Properties {
   /** scala-library TASTy jar */
   def scalaLibraryTasty: Option[String] = sys.props.get("dotty.tests.tasties.scalaLibrary")
 
+  /** If we are using the scala-library TASTy jar */
+  def usingScalaLibraryTasty: Boolean = scalaLibraryTasty.isDefined
+
   /** scala-asm jar */
   def scalaAsm: String = sys.props("dotty.tests.classes.scalaAsm")
 

compiler/test/dotty/tools/TestSources.scala

@@ -6,6 +6,7 @@ import java.io.File
 import java.nio.file._
 
 import scala.jdk.CollectionConverters._
+import dotty.Properties
 
 object TestSources {
 
@@ -36,6 +37,14 @@ object TestSources {
   def runTestRecheckExcluded: List[String] = loadList(runTestRecheckExcludesFile)
   def runLazyValsAllowlist: List[String] = loadList(runLazyValsAllowlistFile)
 
+  // other lists
+
+  def scala2LibraryTastyBlacklistFile: String = "compiler/test/dotc/scala2-library-tasty.blacklist"
+
+  def scala2LibraryTastyBlacklisted: List[String] =
+    if Properties.usingScalaLibraryTasty then loadList(scala2LibraryTastyBlacklistFile)
+    else Nil
+
   // load lists
 
   private def loadList(path: String): List[String] = {

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

@@ -120,7 +120,7 @@ class BootstrappedOnlyCompilationTests {
 
   @Test def runMacros: Unit = {
     implicit val testGroup: TestGroup = TestGroup("runMacros")
-    compileFilesInDir("tests/run-macros", defaultOptions.and("-Xcheck-macros"))
+    compileFilesInDir("tests/run-macros", defaultOptions.and("-Xcheck-macros"), FileFilter.exclude(TestSources.scala2LibraryTastyBlacklisted))
       .checkRuns()
   }
 

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

@@ -32,7 +32,7 @@ class CompilationTests {
     implicit val testGroup: TestGroup = TestGroup("compilePos")
     var tests = List(
       compileFilesInDir("tests/pos", defaultOptions.and("-Ysafe-init", "-Wunused:all", "-Xlint:private-shadow", "-Xlint:type-parameter-shadow"), FileFilter.include(TestSources.posLintingAllowlist)),
-      compileFilesInDir("tests/pos", defaultOptions.and("-Ysafe-init"), FileFilter.exclude(TestSources.posLintingAllowlist)),
+      compileFilesInDir("tests/pos", defaultOptions.and("-Ysafe-init"), FileFilter.exclude(TestSources.posLintingAllowlist ::: TestSources.scala2LibraryTastyBlacklisted)),
       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")),
@@ -44,7 +44,10 @@ class CompilationTests {
       // Run tests for legacy lazy vals
       compileFilesInDir("tests/pos", defaultOptions.and("-Ysafe-init", "-Ylegacy-lazy-vals", "-Ycheck-constraint-deps"), FileFilter.include(TestSources.posLazyValsAllowlist)),
       compileDir("tests/pos-special/java-param-names", defaultOptions.withJavacOnlyOptions("-parameters")),
-      compileDir("tests/pos-special/stdlib", allowDeepSubtypes),
+    ) ::: (
+      // FIXME: This fails due to a bug involving self types and capture checking
+      if Properties.usingScalaLibraryTasty then Nil
+      else List(compileDir("tests/pos-special/stdlib", allowDeepSubtypes))
     )
 
     if scala.util.Properties.isJavaAtLeast("16") then
@@ -130,7 +133,7 @@ class CompilationTests {
   @Test def negAll: Unit = {
     implicit val testGroup: TestGroup = TestGroup("compileNeg")
     aggregateTests(
-      compileFilesInDir("tests/neg", defaultOptions),
+      compileFilesInDir("tests/neg", defaultOptions, FileFilter.exclude(TestSources.scala2LibraryTastyBlacklisted)),
       compileFilesInDir("tests/neg-deep-subtype", allowDeepSubtypes),
       compileFilesInDir("tests/neg-custom-args/captures", defaultOptions.and("-language:experimental.captureChecking")),
       compileFile("tests/neg-custom-args/sourcepath/outer/nested/Test1.scala", defaultOptions.and("-sourcepath", "tests/neg-custom-args/sourcepath")),
@@ -153,7 +156,7 @@ class CompilationTests {
   @Test def runAll: Unit = {
     implicit val testGroup: TestGroup = TestGroup("runAll")
     aggregateTests(
-      compileFilesInDir("tests/run", defaultOptions.and("-Ysafe-init")),
+      compileFilesInDir("tests/run", defaultOptions.and("-Ysafe-init"), FileFilter.exclude(TestSources.scala2LibraryTastyBlacklisted)),
       compileFilesInDir("tests/run-deep-subtype", allowDeepSubtypes),
       compileFilesInDir("tests/run-custom-args/captures", allowDeepSubtypes.and("-language:experimental.captureChecking")),
       // Run tests for legacy lazy vals.
@@ -173,7 +176,7 @@ class CompilationTests {
   @Test def pickling: Unit = {
     implicit val testGroup: TestGroup = TestGroup("testPickling")
     aggregateTests(
-      compileFilesInDir("tests/pos", picklingOptions, FileFilter.exclude(TestSources.posTestPicklingBlacklisted)),
+      compileFilesInDir("tests/pos", picklingOptions, FileFilter.exclude(TestSources.posTestPicklingBlacklisted ::: TestSources.scala2LibraryTastyBlacklisted)),
       compileFilesInDir("tests/run", picklingOptions, FileFilter.exclude(TestSources.runTestPicklingBlacklisted))
     ).checkCompile()
   }
@@ -213,8 +216,8 @@ class CompilationTests {
   @Test def checkInitGlobal: Unit = {
     implicit val testGroup: TestGroup = TestGroup("checkInitGlobal")
     val options = defaultOptions.and("-Ysafe-init-global", "-Xfatal-warnings")
-    compileFilesInDir("tests/init-global/neg", options).checkExpectedErrors()
-    compileFilesInDir("tests/init-global/pos", options).checkCompile()
+    compileFilesInDir("tests/init-global/neg", options, FileFilter.exclude(TestSources.scala2LibraryTastyBlacklisted)).checkExpectedErrors()
+    compileFilesInDir("tests/init-global/pos", options, FileFilter.exclude(TestSources.scala2LibraryTastyBlacklisted)).checkCompile()
   }
 
   // initialization tests

compiler/test/dotty/tools/dotc/coverage/CoverageTests.scala

@@ -3,6 +3,7 @@ package dotty.tools.dotc.coverage
 import org.junit.Test
 import org.junit.AfterClass
 import org.junit.Assert.*
+import org.junit.Assume.*
 import org.junit.experimental.categories.Category
 import dotty.{BootstrappedOnlyTests, Properties}
 import dotty.tools.vulpix.*
@@ -28,10 +29,18 @@ class CoverageTests:
 
   @Test
   def checkCoverageStatements(): Unit =
+    assumeFalse(
+      "FIXME: test output differs when using Scala 2 library TASTy",
+      Properties.usingScalaLibraryTasty
+    )
     checkCoverageIn(rootSrc.resolve("pos"), false)
 
   @Test
   def checkInstrumentedRuns(): Unit =
+    assumeFalse(
+      "FIXME: test output differs when using Scala 2 library TASTy",
+      Properties.usingScalaLibraryTasty
+    )
     checkCoverageIn(rootSrc.resolve("run"), true)
 
   def checkCoverageIn(dir: Path, run: Boolean)(using TestGroup): Unit =

compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala

@@ -63,12 +63,14 @@ class PatmatExhaustivityTest {
 
   @Test
   def patmatExhaustivity: Unit = {
+    val blacklisted = TestSources.scala2LibraryTastyBlacklisted.toSet
     val res = Directory(testsDir).list.toList
       .filter(f => f.extension == "scala" || f.isDirectory)
       .filter { f =>
         val path = if f.isDirectory then f.path + "/" else f.path
         Properties.testsFilter.isEmpty || Properties.testsFilter.exists(path.contains)
       }
+      .filterNot(f => blacklisted.contains(f.name))
       .map(f => if f.isDirectory then compileDir(f.jpath) else compileFile(f.jpath))
 
     val failed = res.filter(!_)