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

[Native][tests] Temporarily mute klibABI/remove[Property|Function] tests

Browse Source
This commit is contained in:
Dmitriy Dolovov
2022-06-18 23:26:37 +04:00
parent f98778e331
commit d60c93c1f8
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt
+16 -8
View File
@@ -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.runner.TestRunChecks
import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* import org.jetbrains.kotlin.konan.blackboxtest.support.settings.*
import org.jetbrains.kotlin.konan.blackboxtest.support.util.* import org.jetbrains.kotlin.konan.blackboxtest.support.util.*
import org.junit.jupiter.api.Assumptions.assumeFalse
import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Tag
import java.io.File import java.io.File
@@ -24,14 +25,21 @@ import java.io.File
abstract class AbstractNativeKlibABITest : AbstractNativeSimpleTest() { abstract class AbstractNativeKlibABITest : AbstractNativeSimpleTest() {
private val producedKlibs = linkedMapOf<KLIB, Collection<File>>() // IMPORTANT: The order makes sense! private val producedKlibs = linkedMapOf<KLIB, Collection<File>>() // IMPORTANT: The order makes sense!
protected fun runTest(@TestDataFile testPath: String): Unit = AbstractKlibABITestCase.doTest( protected fun runTest(@TestDataFile testPath: String) {
testDir = getAbsoluteFile(testPath), assumeFalse(
buildDir = buildDir, (testPath == "compiler/testData/klibABI/removeProperty/" || testPath == "compiler/testData/klibABI/removeFunction/")
stdlibFile = stdlibFile, && testRunSettings.get<CacheMode>().staticCacheRequiredForEveryLibrary
buildKlib = ::buildKlib, )
buildBinaryAndRun = { _, allDependencies -> buildBinaryAndRun(allDependencies) },
onNonEmptyBuildDirectory = ::backupDirectoryContents 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<File>, klibFile: File) { private fun buildKlib(moduleName: String, moduleSourceDir: File, moduleDependencies: Collection<File>, klibFile: File) {
val module = createModule(moduleName) val module = createModule(moduleName)