From eced4ef9d2631e9907a7a7919d073999f2f4f2fd Mon Sep 17 00:00:00 2001 From: Michael Wright <Slooxied@gmail.com> Date: Fri, 12 Feb 2021 17:47:26 +0100 Subject: [PATCH 1/2] Remove GameloopIT test for IOS --- integration_tests/src/test/kotlin/integration/GameloopIT.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/integration_tests/src/test/kotlin/integration/GameloopIT.kt b/integration_tests/src/test/kotlin/integration/GameloopIT.kt index c35dc0bd2a..d38c6e5f13 100644 --- a/integration_tests/src/test/kotlin/integration/GameloopIT.kt +++ b/integration_tests/src/test/kotlin/integration/GameloopIT.kt @@ -2,6 +2,7 @@ package integration import FlankCommand import com.google.common.truth.Truth +import flank.common.isMacOS import flank.common.isWindows import org.junit.Assume.assumeFalse import org.junit.Test @@ -35,6 +36,8 @@ class GameloopIT { @Test fun iosGameloop() { assumeFalse(isWindows) + assumeFalse(isMacOS) + assumeFalse(!isWindows && !isMacOS) val name = "$name-ios" val result = FlankCommand( flankPath = FLANK_JAR_PATH, From d1f8d394d35ad965d562412e0b961b2fe135eb2d Mon Sep 17 00:00:00 2001 From: Piotr Adamczyk <piotr.adamczyk@gogoapps.io> Date: Fri, 12 Feb 2021 17:53:23 +0100 Subject: [PATCH 2/2] added isLinux --- common/src/main/kotlin/flank/common/Os.kt | 3 +++ integration_tests/src/test/kotlin/integration/GameloopIT.kt | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/kotlin/flank/common/Os.kt b/common/src/main/kotlin/flank/common/Os.kt index 74bea46306..75bb6f8330 100644 --- a/common/src/main/kotlin/flank/common/Os.kt +++ b/common/src/main/kotlin/flank/common/Os.kt @@ -11,3 +11,6 @@ val isMacOS: Boolean by lazy { val isWindows: Boolean by lazy { osName.indexOf("win") >= 0 } + +val isLinux: Boolean + get() = !isWindows && !isMacOS diff --git a/integration_tests/src/test/kotlin/integration/GameloopIT.kt b/integration_tests/src/test/kotlin/integration/GameloopIT.kt index d38c6e5f13..1b49579d7d 100644 --- a/integration_tests/src/test/kotlin/integration/GameloopIT.kt +++ b/integration_tests/src/test/kotlin/integration/GameloopIT.kt @@ -2,6 +2,7 @@ package integration import FlankCommand import com.google.common.truth.Truth +import flank.common.isLinux import flank.common.isMacOS import flank.common.isWindows import org.junit.Assume.assumeFalse @@ -37,7 +38,7 @@ class GameloopIT { fun iosGameloop() { assumeFalse(isWindows) assumeFalse(isMacOS) - assumeFalse(!isWindows && !isMacOS) + assumeFalse(isLinux) val name = "$name-ios" val result = FlankCommand( flankPath = FLANK_JAR_PATH,