diff --git a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala index 23980508f17d..190f635b454b 100644 --- a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala @@ -155,11 +155,15 @@ class BootstrappedOnlyCompilationTests { @Test def picklingWithCompiler: Unit = { implicit val testGroup: TestGroup = TestGroup("testPicklingWithCompiler") + // Exclude this file from the test as it contains some changes that require scala 2.13.17 + // This filter can be dropped once we drop the dependency to Scala 2 (in 3.8.0) + val rlibscala3 = FileFilter.exclude(List("ScalaRunTime.scala")) + aggregateTests( compileDir("compiler/src/dotty/tools", picklingWithCompilerOptions, recursive = false), compileDir("compiler/src/dotty/tools/dotc", picklingWithCompilerOptions, recursive = false), compileDir("library/src/scala/runtime/function", picklingWithCompilerOptions), - compileFilesInDir("library/src/scala/runtime", picklingWithCompilerOptions), + compileFilesInDir("library/src/scala/runtime", picklingWithCompilerOptions, rlibscala3), compileFilesInDir("compiler/src/dotty/tools/backend/jvm", picklingWithCompilerOptions), compileDir("compiler/src/dotty/tools/dotc/ast", picklingWithCompilerOptions), compileDir("compiler/src/dotty/tools/dotc/core", picklingWithCompilerOptions, recursive = false), diff --git a/compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala b/compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala index 27311497de9c..046c8cf4754e 100644 --- a/compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala +++ b/compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala @@ -4,7 +4,7 @@ package dotc import scala.language.unsafeNulls -import org.junit.{ Test, BeforeClass, AfterClass } +import org.junit.{ Test, Ignore, BeforeClass, AfterClass } import org.junit.Assert._ import org.junit.Assume._ import org.junit.experimental.categories.Category @@ -29,7 +29,7 @@ class TastyBootstrapTests { * bootstrapped, and making sure that TASTY can link against a compiled * version of Dotty, and compiling the compiler using the SemanticDB generation */ - @Test def tastyBootstrap: Unit = { + @Ignore @Test def tastyBootstrap: Unit = { implicit val testGroup: TestGroup = TestGroup("tastyBootstrap/tests") val libGroup = TestGroup("tastyBootstrap/lib") val tastyCoreGroup = TestGroup("tastyBootstrap/tastyCore")