From e452efe51bbac4ff036aedcbbbd0b7a507e92cc6 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 23 May 2022 09:28:09 +0000 Subject: [PATCH] [Gradle, JS] environment map as input, not nested Merge-request: KT-MR-6326 Merged-by: Ilya Goncharov ^KT-51532 fixed --- .../org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 3 +++ .../jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index 0a28b5d9ff0..42a2e067a43 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt @@ -1021,6 +1021,9 @@ abstract class AbstractKotlin2JsGradlePluginIT(protected val irBackend: Boolean) build("build") { checkIrCompilationMessage() + // It makes sense only since Tests will be run on Gradle 7.2 + assertOutputDoesNotContain("Execution optimizations have been disabled for task ':nodeTest'") + assertTasksExecuted(":nodeTest") } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt index 6a5aee9c776..a94b64fc5a0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt @@ -46,7 +46,7 @@ constructor( private val projectPath = project.path - @Nested + @Input var environment = mutableMapOf() @get:Internal