azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "[K/N][Tests] Ignore KonanDriverTest tests on MinGW/opt.debug/cache.no""

Browse Source 
This reverts commit 876be8f17a.
This commit is contained in:
Alexander Shabalin
2024-02-23 13:12:59 +01:00
committed by Space Team
parent 9832edddab
commit 316614bc9e
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/test/KonanDriverTest.kt
+15 -1
View File
@@ -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.TestModule
import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.ExecutableCompilation 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.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.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.GCScheduler
import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeHome 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.konan.test.blackbox.targets
import org.jetbrains.kotlin.native.executors.RunProcessResult import org.jetbrains.kotlin.native.executors.RunProcessResult
import org.jetbrains.kotlin.native.executors.runProcess import org.jetbrains.kotlin.native.executors.runProcess
@@ -84,6 +86,10 @@ class KonanDriverTest : AbstractNativeSimpleTest() {
@Test @Test
fun testDriverProducesRunnableBinaries() { fun testDriverProducesRunnableBinaries() {
Assumptions.assumeFalse(HostManager.hostIsMingw &&
testRunSettings.get<CacheMode>() == CacheMode.WithoutCache &&
testRunSettings.get<OptimizationMode>() == OptimizationMode.DEBUG
) // KT-65963
val module = TestModule.Exclusive("moduleName", emptySet(), emptySet(), emptySet()) val module = TestModule.Exclusive("moduleName", emptySet(), emptySet(), emptySet())
val kexe = buildDir.resolve("kexe.kexe").also { it.delete() } val kexe = buildDir.resolve("kexe.kexe").also { it.delete() }
val compilation = ExecutableCompilation( val compilation = ExecutableCompilation(
@@ -108,6 +114,10 @@ class KonanDriverTest : AbstractNativeSimpleTest() {
@Test @Test
fun testDriverVersion() { fun testDriverVersion() {
Assumptions.assumeFalse(HostManager.hostIsMingw &&
testRunSettings.get<CacheMode>() == CacheMode.WithoutCache &&
testRunSettings.get<OptimizationMode>() == OptimizationMode.DEBUG
) // KT-65963
// No need to test with different GC schedulers // No need to test with different GC schedulers
Assumptions.assumeFalse(testRunSettings.get<GCScheduler>() == GCScheduler.AGGRESSIVE) Assumptions.assumeFalse(testRunSettings.get<GCScheduler>() == GCScheduler.AGGRESSIVE)
@@ -130,6 +140,10 @@ class KonanDriverTest : AbstractNativeSimpleTest() {
@Test @Test
fun testOverrideKonanProperties() { fun testOverrideKonanProperties() {
Assumptions.assumeFalse(HostManager.hostIsMingw &&
testRunSettings.get<CacheMode>() == CacheMode.WithoutCache &&
testRunSettings.get<OptimizationMode>() == OptimizationMode.DEBUG
) // KT-65963
// No need to test with different GC schedulers // No need to test with different GC schedulers
Assumptions.assumeFalse(testRunSettings.get<GCScheduler>() == GCScheduler.AGGRESSIVE) Assumptions.assumeFalse(testRunSettings.get<GCScheduler>() == GCScheduler.AGGRESSIVE)