From a8263361c0f7c5668a06f1f88a11b9ac1561054b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Sat, 27 May 2017 17:46:30 +0300 Subject: [PATCH] Fix tests for coroutines setting in Gradle ArgumentUtils#convertArgumentsToStringList does not serialize an argument with default value, so the string "-Xcoroutines=warn" was no longer present in logs. --- .../src/test/kotlin/org/jetbrains/kotlin/gradle/CoroutinesIT.kt | 2 +- .../src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CoroutinesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CoroutinesIT.kt index ff0b2019cb6..3c9e925a086 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CoroutinesIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CoroutinesIT.kt @@ -112,7 +112,7 @@ class CoroutinesIT: BaseGradleIT() { } build("build") { - assertContains("-Xcoroutines=$coroutineSupport") + assertContains("args.coroutinesState=$coroutineSupport") } } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 1b9c328a837..9f53973eeac 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -157,6 +157,8 @@ abstract class AbstractKotlinCompile() : AbstractCo Coroutines.ERROR -> CommonCompilerArguments.ERROR } + logger.kotlinDebug { "args.coroutinesState=${args.coroutinesState}" } + if (project.logger.isDebugEnabled) { args.verbose = true }