Skip to content

Fix #5565: Revert the {pos,run}-separate-compilation changes #5571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions compiler/test/dotc/pos-test-pickling.blacklist
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ t2712-5.scala
t2726
t2741
t284-pos.scala
t3249
t3419
t3452f.scala
t3486
t3612.scala
t3864
t3999
Expand Down
4 changes: 4 additions & 0 deletions compiler/test/dotc/run-test-pickling.blacklist
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ i5257.scala
lazy-implicit-lists.scala
lazy-implicit-nums.scala
lazy-traits.scala
t3452d
t3452e
t3452g
t7374
t8133
t8133b
tuples1.scala
Expand Down
3 changes: 0 additions & 3 deletions compiler/test/dotty/tools/dotc/CompilationTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,8 @@ class CompilationTests extends ParallelTesting {
compileFilesInDir("tests/new", defaultOptions) +
compileFilesInDir("tests/pos-scala2", scala2Mode) +
compileFilesInDir("tests/pos", defaultOptions) +
compileFilesInDir("tests/pos-separate-compilation", defaultOptions) +
compileFilesInDir("tests/pos-deep-subtype", allowDeepSubtypes) +
compileFilesInDir("tests/pos-kind-polymorphism", defaultOptions and "-Ykind-polymorphism") +
compileDir("tests/pos-separate-compilation/i1137-1", defaultOptions) +
compileFile(
// succeeds despite -Xfatal-warnings because of -nowarn
"tests/neg-custom-args/fatal-warnings/xfatalWarnings.scala",
Expand Down Expand Up @@ -173,7 +171,6 @@ class CompilationTests extends ParallelTesting {
implicit val testGroup: TestGroup = TestGroup("runAll")
compileFilesInDir("tests/run-custom-args/Yretain-trees", defaultOptions and "-Yretain-trees") +
compileFile("tests/run-custom-args/tuple-cons.scala", allowDeepSubtypes) +
compileFilesInDir("tests/run-separate-compilation", defaultOptions) +
compileFile("tests/run-custom-args/i5256.scala", allowDeepSubtypes) +
compileFilesInDir("tests/run", defaultOptions)
}.checkRuns()
Expand Down
8 changes: 7 additions & 1 deletion compiler/test/dotty/tools/vulpix/ParallelTesting.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1242,9 +1242,15 @@ trait ParallelTesting extends RunnerOrchestration { self =>

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

val isPicklerTest = flags.options.contains("-Ytest-pickler")
def ignoreDir(dir: JFile): Boolean = {
// Pickler tests stop after pickler not producing class/tasty files. The second part of the compilation
// will not be able to compile due to the missing artifacts from the first part.
isPicklerTest && dir.listFiles().exists(file => file.getName.endsWith("_2.scala") || file.getName.endsWith("_2.java"))
}
val targets =
files.map(f => JointCompilationSource(testGroup.name, Array(f), flags, createOutputDirsForFile(f, sourceDir, outDir))) ++
dirs.map(dir => SeparateCompilationSource(testGroup.name, dir, flags, createOutputDirsForDir(dir, sourceDir, outDir)))
dirs.collect { case dir if !ignoreDir(dir) => SeparateCompilationSource(testGroup.name, dir, flags, createOutputDirsForDir(dir, sourceDir, outDir)) }

// Create a CompilationTest and let the user decide whether to execute a pos or a neg test
new CompilationTest(targets)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.