Skip to content

Commit b1002d6

Browse files
committed
Renames and add comment
1 parent 90b45b5 commit b1002d6

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,13 +1242,15 @@ trait ParallelTesting extends RunnerOrchestration { self =>
12421242

12431243
val (dirs, files) = compilationTargets(sourceDir, fileFilter)
12441244

1245-
val doSequentialSeparateCompilation = !flags.options.contains("-Ytest-pickler")
1246-
def compileDir(dir: JFile): Boolean = {
1247-
doSequentialSeparateCompilation || !dir.listFiles().exists(file => file.getName.endsWith(".java") || file.getName.endsWith("_2.scala"))
1245+
val isPicklerTest = flags.options.contains("-Ytest-pickler")
1246+
def ignoreDir(dir: JFile): Boolean = {
1247+
// Pickler tests stop after pickler not producing class/tasty files. The second part of the compilation
1248+
// 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"))
12481250
}
12491251
val targets =
12501252
files.map(f => JointCompilationSource(testGroup.name, Array(f), flags, createOutputDirsForFile(f, sourceDir, outDir))) ++
1251-
dirs.collect { case dir if compileDir(dir) => SeparateCompilationSource(testGroup.name, dir, flags, createOutputDirsForDir(dir, sourceDir, outDir)) }
1253+
dirs.collect { case dir if !ignoreDir(dir) => SeparateCompilationSource(testGroup.name, dir, flags, createOutputDirsForDir(dir, sourceDir, outDir)) }
12521254

12531255
// Create a CompilationTest and let the user decide whether to execute a pos or a neg test
12541256
new CompilationTest(targets)

0 commit comments

Comments
 (0)