Skip to content

Commit 3b9a505

Browse files
authored
chore: make a few adjustments to merge the scala2 stdlib (#23527)
To be able to merge #23522, we need to make some adjustments to the tests and undo them later when the stdlib will be fully independent of scala 2. [skip ci]
2 parents 9e28b14 + ea97846 commit 3b9a505

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,15 @@ class BootstrappedOnlyCompilationTests {
155155

156156
@Test def picklingWithCompiler: Unit = {
157157
implicit val testGroup: TestGroup = TestGroup("testPicklingWithCompiler")
158+
// Exclude this file from the test as it contains some changes that require scala 2.13.17
159+
// This filter can be dropped once we drop the dependency to Scala 2 (in 3.8.0)
160+
val rlibscala3 = FileFilter.exclude(List("ScalaRunTime.scala"))
161+
158162
aggregateTests(
159163
compileDir("compiler/src/dotty/tools", picklingWithCompilerOptions, recursive = false),
160164
compileDir("compiler/src/dotty/tools/dotc", picklingWithCompilerOptions, recursive = false),
161165
compileDir("library/src/scala/runtime/function", picklingWithCompilerOptions),
162-
compileFilesInDir("library/src/scala/runtime", picklingWithCompilerOptions),
166+
compileFilesInDir("library/src/scala/runtime", picklingWithCompilerOptions, rlibscala3),
163167
compileFilesInDir("compiler/src/dotty/tools/backend/jvm", picklingWithCompilerOptions),
164168
compileDir("compiler/src/dotty/tools/dotc/ast", picklingWithCompilerOptions),
165169
compileDir("compiler/src/dotty/tools/dotc/core", picklingWithCompilerOptions, recursive = false),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package dotc
44

55
import scala.language.unsafeNulls
66

7-
import org.junit.{ Test, BeforeClass, AfterClass }
7+
import org.junit.{ Test, Ignore, BeforeClass, AfterClass }
88
import org.junit.Assert._
99
import org.junit.Assume._
1010
import org.junit.experimental.categories.Category
@@ -29,7 +29,7 @@ class TastyBootstrapTests {
2929
* bootstrapped, and making sure that TASTY can link against a compiled
3030
* version of Dotty, and compiling the compiler using the SemanticDB generation
3131
*/
32-
@Test def tastyBootstrap: Unit = {
32+
@Ignore @Test def tastyBootstrap: Unit = {
3333
implicit val testGroup: TestGroup = TestGroup("tastyBootstrap/tests")
3434
val libGroup = TestGroup("tastyBootstrap/lib")
3535
val tastyCoreGroup = TestGroup("tastyBootstrap/tastyCore")

0 commit comments

Comments
 (0)