From 617bc6c296617b26e8d4797ad2a25f3bbf7bb664 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 2 Jun 2016 15:47:26 +0300 Subject: [PATCH] Refactoring: use daemon by default in gradle tests --- .../kotlin/gradle/AbstractKotlinAndroidGradleTests.kt | 5 ++--- .../test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt | 2 +- .../org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt | 3 +-- .../src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIT.kt | 3 --- .../kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt | 2 +- .../org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt | 3 --- .../gradle/KotlinGradlePluginJpsParametrizedCLIOnly.kt | 4 ++-- 7 files changed, 7 insertions(+), 15 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index b242057d443..1228a81d22f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -14,9 +14,8 @@ abstract class AbstractKotlinAndroidGradleTests( ) : BaseGradleIT() { override fun defaultBuildOptions() = - BuildOptions(withDaemon = true, - androidHome = File("../../../dependencies/android-sdk-for-tests"), - androidGradlePluginVersion = androidGradlePluginVersion) + super.defaultBuildOptions().copy(androidHome = File("../../../dependencies/android-sdk-for-tests"), + androidGradlePluginVersion = androidGradlePluginVersion) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 7433ecd1bb0..176c6832535 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -20,7 +20,7 @@ abstract class BaseGradleIT { protected var workingDir = File(".") - protected open fun defaultBuildOptions(): BuildOptions = BuildOptions(withDaemon = false) + protected open fun defaultBuildOptions(): BuildOptions = BuildOptions(withDaemon = true) @Before fun setUp() { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt index 769ece16355..af44201ec1b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt @@ -1,12 +1,11 @@ package org.jetbrains.kotlin.gradle -import org.gradle.api.logging.LogLevel import org.junit.Test class SimpleKotlinGradleIT : BaseGradleIT() { companion object { - private val GRADLE_VERSION = "2.3" + private const val GRADLE_VERSION = "2.10" } @Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIT.kt index fac75a2caa5..7cfc9a16b1e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIT.kt @@ -12,9 +12,6 @@ class KaptIT: BaseGradleIT() { private const val GRADLE_VERSION = "2.14.1" } - override fun defaultBuildOptions(): BuildOptions = - super.defaultBuildOptions().copy(withDaemon = true) - @Test fun testSimple() { val project = Project("kaptSimple", GRADLE_VERSION) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt index e9b1048a3f5..3844de20f69 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt @@ -28,7 +28,7 @@ abstract class KaptIncrementalBaseIT(val shouldUseStubs: Boolean): BaseGradleIT( arrayOf("A", "funA", "valA", "funUtil", "valUtil", "B", "funB", "valB", "useB") override fun defaultBuildOptions(): BuildOptions = - super.defaultBuildOptions().copy(withDaemon = true, incremental = true) + super.defaultBuildOptions().copy(incremental = true) @Test fun testBasic() { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 4af6ce60454..764f861f4ce 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -16,9 +16,6 @@ class KotlinGradleIT: BaseGradleIT() { private const val GRADLE_VERSION = "2.10" } - override fun defaultBuildOptions(): BuildOptions = - super.defaultBuildOptions().copy(withDaemon = true) - @Test fun testCrossCompile() { val project = Project("kotlinJavaProject", GRADLE_VERSION) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginJpsParametrizedCLIOnly.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginJpsParametrizedCLIOnly.kt index 760669c4ef8..077b389a277 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginJpsParametrizedCLIOnly.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginJpsParametrizedCLIOnly.kt @@ -40,8 +40,8 @@ class KotlinGradlePluginJpsParametrizedCLIOnly : BaseIncrementalGradleIT() { JpsTestProject(buildLogFinder, jpsResourcesPath, relativePath).performAndAssertBuildStages(weakTesting = true) } - override fun defaultBuildOptions(): BuildOptions = - BuildOptions(withDaemon = true, incremental = true) + override fun defaultBuildOptions() = + super.defaultBuildOptions().copy(incremental = true) companion object {