From ecf1eef8db3ff92b1dc05b6d6e837bb126d6b032 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Mon, 31 Jan 2022 20:54:09 +0300 Subject: [PATCH] [Gradle][test] Run IR linker test only on macos x64 Arm64 is supported in newer versions of Ktor and coroutines that don't reproduce linkage failure --- .../kotlin/gradle/native/NativeIrLinkerIssuesIT.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt index 155c19373bd..86407b8562f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.gradle.native.NativeExternalDependenciesIT.Companion import org.jetbrains.kotlin.gradle.native.NativeExternalDependenciesIT.Companion.findParameterInOutput import org.jetbrains.kotlin.konan.library.KONAN_PLATFORM_LIBS_NAME_PREFIX import org.jetbrains.kotlin.konan.target.HostManager +import org.jetbrains.kotlin.konan.target.KonanTarget import org.junit.Assume.assumeFalse import org.junit.Assume.assumeTrue import org.junit.Test @@ -26,8 +27,11 @@ class NativeIrLinkerIssuesIT : BaseGradleIT() { @Test fun `ktor 1_5_4 and coroutines 1_5_0-RC-native-mt (KT-46697)`() { - // Run this test only on macOS. - assumeTrue(HostManager.hostIsMac) + // Run this test only on macOS x64, + // arm64 requires newer ktor (>=1.6.5) and coroutines (>=1.5.2-native-mt) + // that compatible to each other and don't fail this way. + // TODO: consider finding a newer versions that support arm64 and reproduce this issue + assumeTrue(HostManager.host == KonanTarget.MACOS_X64) buildApplicationAndFail( directoryPrefix = null,