azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unify test tasks configuration in gradle tests

Browse Source
This commit is contained in:
Alexey Tsvetkov
2019-07-30 19:48:26 +03:00
parent 847af4456a
commit 1a0c6fe8b8
1 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+27 -28
View File
@@ -44,37 +44,12 @@ dependencies {
testCompileOnly(project(":kotlin-test:kotlin-test-common")) { isTransitive = false } testCompileOnly(project(":kotlin-test:kotlin-test-common")) { isTransitive = false }
} }
projectTest { // additional configuration in tasks.withType<Test> below
executable = "${rootProject.extra["JDK_18"]!!}/bin/java" projectTest("test") {}
dependsOn(":kotlin-gradle-plugin:validateTaskProperties")
dependsOn(
":kotlin-allopen:install",
":kotlin-allopen:plugin-marker:install",
":kotlin-noarg:install",
":kotlin-allopen:plugin-marker:install",
":kotlin-sam-with-receiver:install",
":kotlin-android-extensions:install",
":kotlin-build-common:install",
":kotlin-compiler-embeddable:install",
":kotlin-gradle-plugin:install",
":kotlin-gradle-plugin:plugin-marker:install",
":kotlin-reflect:install",
":kotlin-annotation-processing-gradle:install",
":kotlin-test:kotlin-test-jvm:install",
":kotlin-gradle-subplugin-example:install",
":kotlin-stdlib-jdk8:install",
":examples:annotation-processor-example:install",
":kotlin-scripting-common:install",
":kotlin-scripting-jvm:install",
":kotlin-scripting-compiler-embeddable:install",
":kotlin-test-nodejs-runner:install"
)
}
tasks.register<Test>("testAdvanceGradleVersion") { projectTest("testAdvanceGradleVersion") {
val gradleVersionForTests = "5.3-rc-2" val gradleVersionForTests = "5.3-rc-2"
systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests) systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
dependsOn(tasks.getByName("test").dependsOn)
} }
tasks.named<Task>("check") { tasks.named<Task>("check") {
@@ -112,6 +87,30 @@ tasks.withType<KotlinCompile> {
tasks.withType<Test> { tasks.withType<Test> {
onlyIf { !project.hasProperty("noTest") } onlyIf { !project.hasProperty("noTest") }
dependsOn(":kotlin-gradle-plugin:validateTaskProperties")
dependsOn(
":kotlin-allopen:install",
":kotlin-allopen:plugin-marker:install",
":kotlin-noarg:install",
":kotlin-allopen:plugin-marker:install",
":kotlin-sam-with-receiver:install",
":kotlin-android-extensions:install",
":kotlin-build-common:install",
":kotlin-compiler-embeddable:install",
":kotlin-gradle-plugin:install",
":kotlin-gradle-plugin:plugin-marker:install",
":kotlin-reflect:install",
":kotlin-annotation-processing-gradle:install",
":kotlin-test:kotlin-test-jvm:install",
":kotlin-gradle-subplugin-example:install",
":kotlin-stdlib-jdk8:install",
":examples:annotation-processor-example:install",
":kotlin-scripting-common:install",
":kotlin-scripting-jvm:install",
":kotlin-scripting-compiler-embeddable:install",
":kotlin-test-nodejs-runner:install"
)
executable = "${rootProject.extra["JDK_18"]!!}/bin/java" executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
systemProperty("kotlinVersion", rootProject.extra["kotlinVersion"] as String) systemProperty("kotlinVersion", rootProject.extra["kotlinVersion"] as String)