Fix Windows sanity test.

This commit is contained in:
Nikolay Igotti
2019-02-15 15:21:43 +03:00
committed by Nikolay Igotti
parent 5aac73dfad
commit de65e29fbe
2 changed files with 15 additions and 3 deletions
+1 -1
View File
@@ -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'
+14 -2
View File
@@ -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() {