Skip to content

Commit 6a6f704

Browse files
committed
Do dot disallow all pickling tests with java files
1 parent b1002d6 commit 6a6f704

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

compiler/test/dotc/pos-test-pickling.blacklist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ t2712-5.scala
2727
t2726
2828
t2741
2929
t284-pos.scala
30+
t3249
3031
t3419
3132
t3452f.scala
33+
t3486
3234
t3612.scala
3335
t3864
3436
t3999

compiler/test/dotc/run-test-pickling.blacklist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ i5257.scala
44
lazy-implicit-lists.scala
55
lazy-implicit-nums.scala
66
lazy-traits.scala
7+
t3452d
8+
t3452e
9+
t3452g
10+
t7374
711
t8133
812
t8133b
913
tuples1.scala

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ class CompilationTests extends ParallelTesting {
9292
compileFilesInDir("tests/pos", defaultOptions) +
9393
compileFilesInDir("tests/pos-deep-subtype", allowDeepSubtypes) +
9494
compileFilesInDir("tests/pos-kind-polymorphism", defaultOptions and "-Ykind-polymorphism") +
95-
compileDir("tests/pos/i1137-1", defaultOptions) +
9695
compileFile(
9796
// succeeds despite -Xfatal-warnings because of -nowarn
9897
"tests/neg-custom-args/fatal-warnings/xfatalWarnings.scala",

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
12461246
def ignoreDir(dir: JFile): Boolean = {
12471247
// Pickler tests stop after pickler not producing class/tasty files. The second part of the compilation
12481248
// will not be able to compile due to the missing artifacts from the first part.
1249-
isPicklerTest && dir.listFiles().exists(file => file.getName.endsWith(".java") || file.getName.endsWith("_2.scala"))
1249+
isPicklerTest && dir.listFiles().exists(file => file.getName.endsWith("_2.scala") || file.getName.endsWith("_2.java"))
12501250
}
12511251
val targets =
12521252
files.map(f => JointCompilationSource(testGroup.name, Array(f), flags, createOutputDirsForFile(f, sourceDir, outDir))) ++

0 commit comments

Comments
 (0)