From 3cf811012a4b1a206b563da892d7c402d39adae6 Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Wed, 4 Jan 2023 08:35:06 +0000 Subject: [PATCH] [Wasm] Reenable gradle integration tests for node and binaryen * Update to supported node.js version * Add missing binaryen flag Merge-request: KT-MR-8180 Merged-by: Svyatoslav Kuzmich --- .../org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt | 3 --- .../testProject/new-mpp-wasm-test/build.gradle.kts | 6 +++--- .../kotlin/gradle/targets/js/binaryen/BinaryenExec.kt | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index 88fe5ebd02b..689557e2c09 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -1991,18 +1991,15 @@ class NewMultiplatformIT : BaseGradleIT() { } @Test - @Ignore fun testWasmNodeTest() = testWasmTest("nodejs", "Node", useBinaryen = false) @Test - @Ignore fun testWasmWithBinaryenNodeTest() = testWasmTest("nodejs", "Node", useBinaryen = true) @Test fun testWasmD8Test() = testWasmTest("d8", "D8", useBinaryen = false) @Test - @Ignore fun testWasmWithBinaryenD8Test() = testWasmTest("d8", "D8", useBinaryen = true) @Test diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts index 9dce6a98e69..5bb5f262a46 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts @@ -8,9 +8,9 @@ repositories { } with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) { - //nightly nodejs that supports wasm M5 - nodeVersion = "19.0.0-nightly202206017ad5b420ae" - nodeDownloadBaseUrl = "https://nodejs.org/download/nightly/" + //canary nodejs that supports wasm GC M6 + nodeVersion = "20.0.0-v8-canary2022112061c569ba0d" + 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/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt index ee7f8a0bc46..eafb45fba4a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt @@ -32,6 +32,7 @@ constructor() : AbstractExecTask(BinaryenExec::class.java) { "--enable-gc", "--enable-reference-types", "--enable-exception-handling", + "--enable-bulk-memory", // For array initialization from data sections "--hybrid", "-O3", "--inline-functions-with-loops",