From d60c93c1f8657017d552f8f0e6da5e1ebc6cb57b Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Sat, 18 Jun 2022 23:26:37 +0400 Subject: [PATCH] [Native][tests] Temporarily mute klibABI/remove[Property|Function] tests --- .../blackboxtest/AbstractNativeKlibABITest.kt | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt index 6f8e365dc99..a0e0dbdb7b1 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestExecutable import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* import org.jetbrains.kotlin.konan.blackboxtest.support.util.* +import org.junit.jupiter.api.Assumptions.assumeFalse import org.junit.jupiter.api.Tag import java.io.File @@ -24,14 +25,21 @@ import java.io.File abstract class AbstractNativeKlibABITest : AbstractNativeSimpleTest() { private val producedKlibs = linkedMapOf>() // IMPORTANT: The order makes sense! - protected fun runTest(@TestDataFile testPath: String): Unit = AbstractKlibABITestCase.doTest( - testDir = getAbsoluteFile(testPath), - buildDir = buildDir, - stdlibFile = stdlibFile, - buildKlib = ::buildKlib, - buildBinaryAndRun = { _, allDependencies -> buildBinaryAndRun(allDependencies) }, - onNonEmptyBuildDirectory = ::backupDirectoryContents - ) + protected fun runTest(@TestDataFile testPath: String) { + assumeFalse( + (testPath == "compiler/testData/klibABI/removeProperty/" || testPath == "compiler/testData/klibABI/removeFunction/") + && testRunSettings.get().staticCacheRequiredForEveryLibrary + ) + + AbstractKlibABITestCase.doTest( + testDir = getAbsoluteFile(testPath), + buildDir = buildDir, + stdlibFile = stdlibFile, + buildKlib = ::buildKlib, + buildBinaryAndRun = { _, allDependencies -> buildBinaryAndRun(allDependencies) }, + onNonEmptyBuildDirectory = ::backupDirectoryContents + ) + } private fun buildKlib(moduleName: String, moduleSourceDir: File, moduleDependencies: Collection, klibFile: File) { val module = createModule(moduleName)