diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index 2ef5e3273c1..3831422fb84 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -3007,7 +3007,7 @@ task interop_callbacksAndVarargs(type: RunInteropKonanTest) { } task interop_echo_server(type: RunInteropKonanTest) { - disabled = (project.testTarget == 'wasm32') // No interop for wasm yet. + disabled = isWasmTarget(project) || isWindowsTarget(project) run = false source = "interop/basics/echo_server.kt" interop = 'sockets' diff --git a/build.gradle b/build.gradle index 0067fbc5a88..15aa4fdda69 100644 --- a/build.gradle +++ b/build.gradle @@ -163,10 +163,22 @@ class PlatformInfo { } boolean isAppleTarget(Project project) { + def target = getTarget(project) + return target.family == Family.IOS || target.family == Family.OSX + } + + boolean isWindowsTarget(Project project) { + return getTarget(project).family == Family.MINGW + } + + boolean isWasmTarget(Project project) { + return getTarget(project).family == Family.WASM + } + + KonanTarget getTarget(Project project) { def platformManager = project.rootProject.platformManager def targetName = project.project.testTarget ?: 'host' - def target = platformManager.targetManager(targetName).target - return target.family == Family.IOS || target.family == Family.OSX + return platformManager.targetManager(targetName).target } Throwable unsupportedPlatformException() {