From 316614bc9e21191987c7c990ec45ddcf7aba576c Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Fri, 23 Feb 2024 13:12:59 +0100 Subject: [PATCH] Revert "Revert "[K/N][Tests] Ignore KonanDriverTest tests on MinGW/opt.debug/cache.no"" This reverts commit 876be8f17a584a220a227f9f9cfa55cb460d6527. --- .../kotlin/konan/test/KonanDriverTest.kt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/KonanDriverTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/KonanDriverTest.kt index 9914c439074..2840f95a653 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/KonanDriverTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/KonanDriverTest.kt @@ -14,10 +14,12 @@ import org.jetbrains.kotlin.konan.test.blackbox.support.TestCompilerArgs import org.jetbrains.kotlin.konan.test.blackbox.support.TestModule import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.ExecutableCompilation import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact -import org.jetbrains.kotlin.konan.test.blackbox.support.settings.executor +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.* import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Binaries +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.CacheMode import org.jetbrains.kotlin.konan.test.blackbox.support.settings.GCScheduler import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeHome +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.executor import org.jetbrains.kotlin.konan.test.blackbox.targets import org.jetbrains.kotlin.native.executors.RunProcessResult import org.jetbrains.kotlin.native.executors.runProcess @@ -84,6 +86,10 @@ class KonanDriverTest : AbstractNativeSimpleTest() { @Test fun testDriverProducesRunnableBinaries() { + Assumptions.assumeFalse(HostManager.hostIsMingw && + testRunSettings.get() == CacheMode.WithoutCache && + testRunSettings.get() == OptimizationMode.DEBUG + ) // KT-65963 val module = TestModule.Exclusive("moduleName", emptySet(), emptySet(), emptySet()) val kexe = buildDir.resolve("kexe.kexe").also { it.delete() } val compilation = ExecutableCompilation( @@ -108,6 +114,10 @@ class KonanDriverTest : AbstractNativeSimpleTest() { @Test fun testDriverVersion() { + Assumptions.assumeFalse(HostManager.hostIsMingw && + testRunSettings.get() == CacheMode.WithoutCache && + testRunSettings.get() == OptimizationMode.DEBUG + ) // KT-65963 // No need to test with different GC schedulers Assumptions.assumeFalse(testRunSettings.get() == GCScheduler.AGGRESSIVE) @@ -130,6 +140,10 @@ class KonanDriverTest : AbstractNativeSimpleTest() { @Test fun testOverrideKonanProperties() { + Assumptions.assumeFalse(HostManager.hostIsMingw && + testRunSettings.get() == CacheMode.WithoutCache && + testRunSettings.get() == OptimizationMode.DEBUG + ) // KT-65963 // No need to test with different GC schedulers Assumptions.assumeFalse(testRunSettings.get() == GCScheduler.AGGRESSIVE)