From c4221b0ec7e129b6e540398c3e9673e7bc3e6a22 Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Thu, 21 Sep 2023 06:57:58 +0000 Subject: [PATCH] [MPP] Enable integration test "K2: Check native stdlib is not shadowed by commonMain stdlib metadata" ^KT-61645 Fixed Merge-request: KT-MR-12243 Merged-by: Vladimir Sukharev --- .../kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt index e391d28f593..8223afc0a9c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt @@ -1239,9 +1239,8 @@ open class HierarchicalMppIT : KGPBaseTest() { } } - @Disabled("Disabled until kotlin-native fix from MR https://jetbrains.team/p/kt/reviews/12079/timeline is deployed and can be tested") @GradleTest - @DisplayName("K2: Check native stdlib is not shadowed by commonMain metadata") + @DisplayName("K2: Check native stdlib is not shadowed by commonMain stdlib metadata") fun testK2NativeStdlibConflict(gradleVersion: GradleVersion) { nativeProject("kt61430", gradleVersion, buildOptions = defaultBuildOptions.copyEnsuringK2()) { build("assemble")