Skip to content

Commit a0abd36

Browse files
committed
Keep Yflexify-tasty tests disabled
1 parent 0f61340 commit a0abd36

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,16 @@ class CompilationTests {
213213
compileFilesInDir("tests/explicit-nulls/unsafe-common", explicitNullsOptions `and` "-Yno-flexible-types", FileFilter.exclude(TestSources.negExplicitNullsScala2LibraryTastyExcludelisted)),
214214
).checkExpectedErrors()
215215

216-
locally {
217-
val unsafeFile = compileFile("tests/explicit-nulls/flexible-unpickle/neg/Unsafe_1.scala", explicitNullsOptions without "-Yexplicit-nulls")
218-
val flexibleFile = compileFile("tests/explicit-nulls/flexible-unpickle/neg/Flexible_2.scala",
219-
explicitNullsOptions.and("-Yflexify-tasty").withClasspath(defaultOutputDir + testGroup + "/Unsafe_1/neg/Unsafe_1"))
216+
// locally {
217+
// val unsafeFile = compileFile("tests/explicit-nulls/flexible-unpickle/neg/Unsafe_1.scala", explicitNullsOptions without "-Yexplicit-nulls")
218+
// val flexibleFile = compileFile("tests/explicit-nulls/flexible-unpickle/neg/Flexible_2.scala",
219+
// explicitNullsOptions.and("-Yflexify-tasty").withClasspath(defaultOutputDir + testGroup + "/Unsafe_1/neg/Unsafe_1"))
220220

221-
flexibleFile.keepOutput.checkExpectedErrors()
221+
// unsafeFile.keepOutput.checkCompile()
222+
// flexibleFile.keepOutput.checkExpectedErrors()
222223

223-
List(unsafeFile, flexibleFile).foreach(_.delete())
224-
}
224+
// List(unsafeFile, flexibleFile).foreach(_.delete())
225+
// }
225226
}
226227

227228
@Test def explicitNullsPos: Unit = {
@@ -232,15 +233,15 @@ class CompilationTests {
232233
compileFilesInDir("tests/explicit-nulls/unsafe-common", explicitNullsOptions `and` "-language:unsafeNulls" `and` "-Yno-flexible-types"),
233234
).checkCompile()
234235

235-
locally {
236-
val tests = List(
237-
compileFile("tests/explicit-nulls/flexible-unpickle/pos/Unsafe_1.scala", explicitNullsOptions `without` "-Yexplicit-nulls"),
238-
compileFile("tests/explicit-nulls/flexible-unpickle/pos/Flexible_2.scala",
239-
explicitNullsOptions.and("-Yflexify-tasty").withClasspath(defaultOutputDir + testGroup + "/Unsafe_1/pos/Unsafe_1")),
240-
).map(_.keepOutput.checkCompile())
236+
// locally {
237+
// val tests = List(
238+
// compileFile("tests/explicit-nulls/flexible-unpickle/pos/Unsafe_1.scala", explicitNullsOptions without "-Yexplicit-nulls"),
239+
// compileFile("tests/explicit-nulls/flexible-unpickle/pos/Flexible_2.scala",
240+
// explicitNullsOptions.and("-Yflexify-tasty").withClasspath(defaultOutputDir + testGroup + "/Unsafe_1/pos/Unsafe_1")),
241+
// ).map(_.keepOutput.checkCompile())
241242

242-
tests.foreach(_.delete())
243-
}
243+
// tests.foreach(_.delete())
244+
// }
244245
}
245246

246247
@Test def explicitNullsWarn: Unit = {

tests/explicit-nulls/flexible-unpickle/pos/Flexible_2.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import unsafeNulls.Foo.*
22
import unsafeNulls.Unsafe_1
33
import unsafeNulls.{A, B, C, F, G, H, I, J, L, M, N, S, T, U, expects}
4+
import unsafeNulls.ZIO
45
import scala.reflect.Selectable.reflectiveSelectable
56
import scala.quoted.*
67

0 commit comments

Comments
 (0)