From e2d758213f23c025d77669e1a81c2669817c1e6a Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Wed, 14 Sep 2022 14:04:35 +0200 Subject: [PATCH] [WASM] Bump wasm gradle tests and ignore binaryen tests --- .../kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt | 4 ++++ .../resources/testProject/new-mpp-wasm-test/build.gradle.kts | 4 ++++ 2 files changed, 8 insertions(+) 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 58a3817bf49..3e7a3cb0319 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 @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.library.KLIB_PROPERTY_SHORT_NAME import org.jetbrains.kotlin.library.KLIB_PROPERTY_UNIQUE_NAME import org.junit.Assert +import org.junit.Ignore import org.junit.Test import java.util.* import java.util.jar.JarFile @@ -2001,15 +2002,18 @@ 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 3982a62345c..8f074d4bf2f 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 @@ -13,6 +13,10 @@ with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootPr nodeDownloadBaseUrl = "https://nodejs.org/download/nightly/" } +with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) { + version = "10.7.157" +} + with(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin.apply(rootProject)) { //A little hacky way to disable yarn for unsupported nightly node version command = "echo"