Revert "[K/N][Tests] Ignore KonanDriverTest tests on MinGW/opt.debug/cache.no"
This reverts commit 313b230333.
This commit is contained in:
committed by
Space Team
parent
bca785a87c
commit
876be8f17a
@@ -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.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.*
|
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.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
|
||||||
@@ -86,10 +84,6 @@ 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(
|
||||||
@@ -114,10 +108,6 @@ 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)
|
||||||
|
|
||||||
@@ -140,10 +130,6 @@ 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)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user