From 34b740e2f78137c0677b507930091da8774f5378 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 13 Dec 2016 22:12:46 +0300 Subject: [PATCH] Minor: add debug test util --- .../org/jetbrains/kotlin/gradle/BaseGradleIT.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 8c9febef843..4d406710901 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -74,7 +74,8 @@ abstract class BaseGradleIT { val incremental: Boolean? = null, val androidHome: File? = null, val androidGradlePluginVersion: String? = null, - val forceOutputToStdout: Boolean = false) + val forceOutputToStdout: Boolean = false, + val debug: Boolean = false) open inner class Project( val projectName: String, @@ -127,6 +128,12 @@ abstract class BaseGradleIT { val compiledJavaSources: Iterable by lazy { javaSourcesListRegex.findAll(output).asIterable().flatMap { it.groups[1]!!.value.split(" ").filter { it.endsWith(".java", ignoreCase = true) }.map { File(it).canonicalFile } } } } + // Basically the same as `Project.build`, tells gradle to wait for debug on 5005 port + // Faster to type than `project.build("-Dorg.gradle.debug=true")` or `project.build(options = defaultBuildOptions().copy(debug = true))` + fun Project.debug(vararg params: String, options: BuildOptions = defaultBuildOptions(), check: CompiledProject.() -> Unit) { + build(*params, options = options.copy(debug = true), check = check) + } + fun Project.build(vararg params: String, options: BuildOptions = defaultBuildOptions(), check: CompiledProject.() -> Unit) { val cmd = createBuildCommand(params, options) val env = createEnvironmentVariablesMap(options) @@ -270,6 +277,9 @@ abstract class BaseGradleIT { add("-Pkotlin_version=" + KOTLIN_VERSION) options.incremental?.let { add("-Pkotlin.incremental=$it") } options.androidGradlePluginVersion?.let { add("-Pandroid_tools_version=$it")} + if (options.debug) { + add("-Dorg.gradle.debug=true") + } } private fun Project.createEnvironmentVariablesMap(options: BuildOptions): Map =