Fix Windows sanity test.
This commit is contained in:
committed by
Nikolay Igotti
parent
5aac73dfad
commit
de65e29fbe
@@ -3007,7 +3007,7 @@ task interop_callbacksAndVarargs(type: RunInteropKonanTest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
task interop_echo_server(type: RunInteropKonanTest) {
|
task interop_echo_server(type: RunInteropKonanTest) {
|
||||||
disabled = (project.testTarget == 'wasm32') // No interop for wasm yet.
|
disabled = isWasmTarget(project) || isWindowsTarget(project)
|
||||||
run = false
|
run = false
|
||||||
source = "interop/basics/echo_server.kt"
|
source = "interop/basics/echo_server.kt"
|
||||||
interop = 'sockets'
|
interop = 'sockets'
|
||||||
|
|||||||
+14
-2
@@ -163,10 +163,22 @@ class PlatformInfo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
boolean isAppleTarget(Project project) {
|
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 platformManager = project.rootProject.platformManager
|
||||||
def targetName = project.project.testTarget ?: 'host'
|
def targetName = project.project.testTarget ?: 'host'
|
||||||
def target = platformManager.targetManager(targetName).target
|
return platformManager.targetManager(targetName).target
|
||||||
return target.family == Family.IOS || target.family == Family.OSX
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Throwable unsupportedPlatformException() {
|
Throwable unsupportedPlatformException() {
|
||||||
|
|||||||
Reference in New Issue
Block a user