Skip to content

Join tests to increase parallelism. #2277

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.

Sign up for GitHub

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 1 commit into from
Apr 20, 2017
Merged

Join tests to increase parallelism. #2277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 21 additions & 46 deletions compiler/test/dotty/tools/dotc/CompilationTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,17 @@ class CompilationTests extends ParallelTesting {

@Test def compilePos: Unit = {
compileList("compileStdLib", StdLibSources.whitelisted, scala2Mode.and("-migration", "-Yno-inline")) +
compileFilesInDir("../tests/pos", defaultOptions)
}.checkCompile()

@Test def compilePosScala2: Unit =
compileFilesInDir("../tests/pos-scala2", scala2Mode).checkCompile()

@Test def compilePosMixedFlags: Unit = {
compileDir("../compiler/src/dotty/tools/dotc/ast", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/config", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/core", allowDeepSubtypes) +
compileDir("../compiler/src/dotty/tools/dotc/transform", allowDeepSubtypes) +
compileDir("../compiler/src/dotty/tools/dotc/parsing", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/printing", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/reporting", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/typer", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/util", defaultOptions) +
compileDir("../compiler/src/dotty/tools/io", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/core", noCheckOptions ++ classPath) +
compileFile("../tests/pos/nullarify.scala", defaultOptions.and("-Ycheck:nullarify")) +
compileFile("../tests/pos-scala2/rewrites.scala", scala2Mode.and("-rewrite")).copyToTarget() +
compileFile("../tests/pos-special/t8146a.scala", allowDeepSubtypes) +
Expand Down Expand Up @@ -65,23 +69,10 @@ class CompilationTests extends ParallelTesting {
"../scala-scala/src/library/scala/collection/mutable/SetLike.scala"
),
scala2Mode
)
}.checkCompile()

@Test def compileCoreNoCheck: Unit =
compileDir("../compiler/src/dotty/tools/dotc/core", noCheckOptions ++ classPath).checkCompile()

@Test def compileDotcInternals: Unit = {
compileDir("../compiler/src/dotty/tools/dotc/ast", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/config", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/core", allowDeepSubtypes) +
compileDir("../compiler/src/dotty/tools/dotc/transform", allowDeepSubtypes) +
compileDir("../compiler/src/dotty/tools/dotc/parsing", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/printing", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/reporting", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/typer", defaultOptions) +
compileDir("../compiler/src/dotty/tools/dotc/util", defaultOptions) +
compileDir("../compiler/src/dotty/tools/io", defaultOptions)
) +
compileFilesInDir("../tests/new", defaultOptions) +
compileFilesInDir("../tests/pos-scala2", scala2Mode)
compileFilesInDir("../tests/pos", defaultOptions)
}.checkCompile()

@Test def posTwice: Unit = {
Expand Down Expand Up @@ -140,17 +131,10 @@ class CompilationTests extends ParallelTesting {
)
}.times(2).checkCompile()

// New tests -----------------------------------------------------------------

@Test def compileNew: Unit =
compileFilesInDir("../tests/new", defaultOptions).checkCompile()

// Negative tests ------------------------------------------------------------

@Test def compileNeg: Unit =
compileShallowFilesInDir("../tests/neg", defaultOptions).checkExpectedErrors()

@Test def compileNegCustomFlags: Unit = {
@Test def compileNeg: Unit = {
compileShallowFilesInDir("../tests/neg", defaultOptions) +
compileFile("../tests/neg/customArgs/typers.scala", allowDoubleBindings) +
compileFile("../tests/neg/customArgs/overrideClass.scala", scala2Mode) +
compileFile("../tests/neg/customArgs/autoTuplingTest.scala", defaultOptions.and("-language:noAutoTupling")) +
Expand Down Expand Up @@ -180,7 +164,9 @@ class CompilationTests extends ParallelTesting {
// Pickling tests are very memory intensive and as such need to be run with a
// lower level of concurrency as to not kill their running VMs

@Test def testPickling1: Unit = {
@Test def testPickling: Unit = {
compileDir("../compiler/src/dotty/tools", picklingOptions) +
compileDir("../compiler/src/dotty/tools/dotc", picklingOptions) +
compileFilesInDir("../tests/new", picklingOptions) +
compileFilesInDir("../tests/pickling", picklingOptions) +
compileDir("../library/src/dotty/runtime", picklingOptions) +
Expand All @@ -196,23 +182,12 @@ class CompilationTests extends ParallelTesting {
compileDir("../compiler/src/dotty/tools/dotc/typer", picklingOptions) +
compileDir("../compiler/src/dotty/tools/dotc/util", picklingOptions) +
compileDir("../compiler/src/dotty/tools/io", picklingOptions) +
compileFile("../tests/pos/pickleinf.scala", picklingOptions)
}.limitThreads(4).checkCompile()

@Test def testPickling2: Unit = {
compileFile("../tests/pos/pickleinf.scala", picklingOptions) +
compileDir("../compiler/src/dotty/tools/dotc/core/classfile", picklingOptions) +
compileDir("../compiler/src/dotty/tools/dotc/core/tasty", picklingOptions) +
compileDir("../compiler/src/dotty/tools/dotc/core/unpickleScala2", picklingOptions)
}.limitThreads(4).checkCompile()

@Test def testPickling3: Unit = {
compileDir("../compiler/src/dotty/tools", picklingOptions)
}.limitThreads(4).checkCompile()

@Test def testPickling4: Unit = {
compileDir("../compiler/src/dotty/tools/dotc", picklingOptions)
}.limitThreads(4).checkCompile()

/** The purpose of this test is two-fold, being able to compile dotty
* bootstrapped, and making sure that TASTY can link against a compiled
* version of Dotty
Expand Down