Parallelize compiler tests

This commit is contained in:
Mikhael Bogdanov
2019-04-16 12:57:05 +02:00
parent 73836928ef
commit dde28ddc52
12 changed files with 15 additions and 19 deletions
+1 -1
View File
@@ -40,4 +40,4 @@ javadocJar()
testsJar() testsJar()
projectTest() projectTest(parallel = true)
+1 -5
View File
@@ -2,10 +2,6 @@ import java.io.File
import org.gradle.api.tasks.bundling.Jar import org.gradle.api.tasks.bundling.Jar
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
tasks.withType<Test> {
maxParallelForks = Math.max(Runtime.getRuntime().availableProcessors() / 2, 1)
}
plugins { plugins {
kotlin("jvm") kotlin("jvm")
id("jps-compatible") id("jps-compatible")
@@ -87,7 +83,7 @@ jar.from("../idea/resources") {
include("META-INF/extensions/compiler.xml") include("META-INF/extensions/compiler.xml")
} }
projectTest { projectTest(parallel = true) {
dependsOn(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator)) systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator))
+1 -1
View File
@@ -24,7 +24,7 @@ sourceSets {
testsJar {} testsJar {}
projectTest { projectTest(parallel = true) {
dependsOn(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
} }
+1 -1
View File
@@ -39,7 +39,7 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
projectTest { projectTest(parallel = true) {
workingDir = rootDir workingDir = rootDir
} }
+1 -1
View File
@@ -34,7 +34,7 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
projectTest { projectTest(parallel = true) {
workingDir = rootDir workingDir = rootDir
} }
+1 -1
View File
@@ -37,7 +37,7 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
projectTest { projectTest(parallel = true) {
workingDir = rootDir workingDir = rootDir
jvmArgs!!.removeIf { it.contains("-Xmx") } jvmArgs!!.removeIf { it.contains("-Xmx") }
maxHeapSize = "3g" maxHeapSize = "3g"
@@ -30,7 +30,7 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
projectTest { projectTest(parallel = true) {
workingDir = rootDir workingDir = rootDir
} }
+1 -1
View File
@@ -24,7 +24,7 @@ tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
projectTest { projectTest(parallel = true) {
executable = "${rootProject.extra["JDK_18"]!!}/bin/java" executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
dependsOn(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
+1 -1
View File
@@ -12,7 +12,7 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
projectTest { projectTest(parallel = true) {
workingDir = rootDir workingDir = rootDir
} }
+1 -1
View File
@@ -30,6 +30,6 @@ val compileKotlin by tasks.getting(KotlinCompile::class) {
val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateRuntimeDescriptorTestsKt") val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateRuntimeDescriptorTestsKt")
projectTest { projectTest(parallel = true) {
workingDir = rootDir workingDir = rootDir
} }
+4 -4
View File
@@ -98,19 +98,19 @@ fun Test.setUpBoxTests(jsEnabled: Boolean, jsIrEnabled: Boolean) {
} }
} }
projectTest { projectTest(parallel = true) {
setUpBoxTests(jsEnabled = true, jsIrEnabled = true) setUpBoxTests(jsEnabled = true, jsIrEnabled = true)
} }
projectTest("jsTest") { projectTest("jsTest", true) {
setUpBoxTests(jsEnabled = true, jsIrEnabled = false) setUpBoxTests(jsEnabled = true, jsIrEnabled = false)
} }
projectTest("jsIrTest") { projectTest("jsIrTest", true) {
setUpBoxTests(jsEnabled = false, jsIrEnabled = true) setUpBoxTests(jsEnabled = false, jsIrEnabled = true)
} }
projectTest("quickTest") { projectTest("quickTest", true) {
setUpBoxTests(jsEnabled = true, jsIrEnabled = false) setUpBoxTests(jsEnabled = true, jsIrEnabled = false)
systemProperty("kotlin.js.skipMinificationTest", "true") systemProperty("kotlin.js.skipMinificationTest", "true")
} }
+1 -1
View File
@@ -28,7 +28,7 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
projectTest { projectTest(parallel = true) {
workingDir = rootDir workingDir = rootDir
dependsOn(":dist") dependsOn(":dist")
} }