From d7cda17d2acba92fddd493e8d043c830f8b82263 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 10 Mar 2016 22:58:45 +0300 Subject: [PATCH] Minor: make it possible to run gradle incremental tests on CI * Rename test so it won't be run by maven's integration-test phase * Adjust allocated heap size --- ...IT.kt => KotlinGradlePluginJpsParametrizedCLIOnly.kt} | 9 +++++++-- .../resources/incrementalGradleProject/gradle.properties | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/{KotlinGradlePluginParametrizedIT.kt => KotlinGradlePluginJpsParametrizedCLIOnly.kt} (77%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginJpsParametrizedCLIOnly.kt similarity index 77% rename from libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginJpsParametrizedCLIOnly.kt index c8142b6de8c..84682d6c5f0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginJpsParametrizedCLIOnly.kt @@ -6,9 +6,14 @@ import org.junit.runner.RunWith import org.junit.runners.Parameterized import java.io.File -@Ignore +// Test does not follow maven failsafe naming convention +// so it is ignored by maven integration-test phase, +// but it is possible run it from CLI (under separate CI configuration for example) +// +// To run this test from CLI: +// mvn integration-test -pl :kotlin-gradle-plugin -Dit.test=KotlinGradlePluginJpsParametrizedCLIOnly @RunWith(Parameterized::class) -class KotlinGradlePluginJpsParametrizedIT : BaseIncrementalGradleIT() { +class KotlinGradlePluginJpsParametrizedCLIOnly : BaseIncrementalGradleIT() { @Parameterized.Parameter @JvmField diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/incrementalGradleProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin/src/test/resources/incrementalGradleProject/gradle.properties index e807e3b5b03..93ce6a94e63 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/incrementalGradleProject/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/incrementalGradleProject/gradle.properties @@ -1 +1 @@ -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m \ No newline at end of file +org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=512m \ No newline at end of file