From 8a6fdf2493913e0e3e0d42c2e88e3cf8653b0950 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 15 Sep 2023 15:02:05 +0200 Subject: [PATCH] [Wasm] Change expected outcome to SUCCESS in wasm-wasi-test Added workaround for missing dependency. #KT-59720 --- .../jetbrains/kotlin/gradle/KotlinWasmGradlePluginIT.kt | 8 ++++++-- .../testProject/new-mpp-wasm-wasi-test/build.gradle.kts | 4 +++- .../src/wasmWasiTest/kotlin/Test.kt | 7 ++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinWasmGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinWasmGradlePluginIT.kt index eeb119b605a..b18907c3f34 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinWasmGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinWasmGradlePluginIT.kt @@ -39,9 +39,13 @@ class KotlinWasmGradlePluginIT : KGPBaseTest() { project("new-mpp-wasm-wasi-test", gradleVersion) { buildGradleKts.modify(::transformBuildScriptWithPluginsDsl) - buildAndFail(":wasmWasiTest") { + build( + // TODO remove as soon as KT-61971 fixed + ":kotlinNodeJsSetup", + ":wasmWasiTest" + ) { assertTasksExecuted(":compileKotlinWasmWasi") - assertTasksFailed(":wasmWasiNodeTest") + assertTasksExecuted(":wasmWasiNodeTest") } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts index 285f5185dc2..c4c89c013b2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts @@ -3,7 +3,9 @@ plugins { } with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) { - nodeVersion = "20.2.0" + // canary nodejs that supports recent Wasm GC changes + nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2" + nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary" } with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/src/wasmWasiTest/kotlin/Test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/src/wasmWasiTest/kotlin/Test.kt index 6c141257f96..038841e1c8d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/src/wasmWasiTest/kotlin/Test.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/src/wasmWasiTest/kotlin/Test.kt @@ -6,14 +6,11 @@ import kotlin.test.assertEquals class WasmTest { @Test - fun test1() = assertEquals(foo(), 1) + fun test1() = assertEquals(foo(), 2) @Test @Ignore - fun test2() = assertEquals(foo(), 2) - - @Test - fun test3() = assertEquals(foo(), 3) + fun test2() = assertEquals(foo(), 1) @Ignore class InnerIgnored {