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

[Native][tests] Unmute klibABI/remove[Property|Function] tests

Browse Source 
This reverts commit d60c93c1f8.
This commit is contained in:
Dmitriy Dolovov
2022-06-21 14:12:32 +04:00
parent 8283537673
commit 66de825508
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt
+8 -16
View File
@@ -17,7 +17,6 @@ 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
@@ -25,21 +24,14 @@ 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) { protected fun runTest(@TestDataFile testPath: String): Unit = AbstractKlibABITestCase.doTest(
assumeFalse( testDir = getAbsoluteFile(testPath),
(testPath == "compiler/testData/klibABI/removeProperty/" || testPath == "compiler/testData/klibABI/removeFunction/") buildDir = buildDir,
&& testRunSettings.get<CacheMode>().staticCacheRequiredForEveryLibrary stdlibFile = stdlibFile,
) buildKlib = ::buildKlib,
buildBinaryAndRun = { _, allDependencies -> buildBinaryAndRun(allDependencies) },
AbstractKlibABITestCase.doTest( onNonEmptyBuildDirectory = ::backupDirectoryContents
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)