From 876be8f17a584a220a227f9f9cfa55cb460d6527 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Wed, 21 Feb 2024 23:41:15 +0100 Subject: [PATCH] Revert "[K/N][Tests] Ignore KonanDriverTest tests on MinGW/opt.debug/cache.no" This reverts commit 313b230333981c2d44990f3d954db8e7a506cad9. --- .../kotlin/konan/test/KonanDriverTest.kt | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) 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 2840f95a653..9914c439074 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,12 +14,10 @@ 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.* +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.executor 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 @@ -86,10 +84,6 @@ 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( @@ -114,10 +108,6 @@ 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) @@ -140,10 +130,6 @@ 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)