From 5f1c09cc2414d7a78e8bcee9ad55cb3fffb122a8 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 28 Mar 2023 14:20:11 +0200 Subject: [PATCH] [PL][tests] Rename KLIB ABI tests to Partial Linkage tests --- ...estUtils.kt => PartialLinkageTestUtils.kt} | 12 +++---- .../generators/tests/GenerateJsTests.kt | 4 +-- ...kt => AbstractJsPartialLinkageTestCase.kt} | 34 +++++++++---------- ...sPartialLinkageNoICTestCaseGenerated.java} | 2 +- ...artialLinkageWithICTestCaseGenerated.java} | 2 +- native/native.tests/build.gradle.kts | 2 +- ...FirNativePartialLinkageTestGenerated.java} | 2 +- ... K1NativePartialLinkageTestGenerated.java} | 2 +- .../generators/tests/GenerateNativeTests.kt | 10 +++--- ...stractNativeKlibBinaryCompatibilityTest.kt | 1 - ...kt => AbstractNativePartialLinkageTest.kt} | 26 +++++++------- 11 files changed, 48 insertions(+), 49 deletions(-) rename compiler/tests-common/tests/org/jetbrains/kotlin/klib/{KlibABITestUtils.kt => PartialLinkageTestUtils.kt} (95%) rename js/js.tests/test/org/jetbrains/kotlin/js/test/ir/{AbstractJsKLibABITestCase.kt => AbstractJsPartialLinkageTestCase.kt} (88%) rename js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/{JsKLibABINoICTestCaseGenerated.java => JsPartialLinkageNoICTestCaseGenerated.java} (98%) rename js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/{JsKLibABIWithICTestCaseGenerated.java => JsPartialLinkageWithICTestCaseGenerated.java} (98%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/{FirKlibABITestGenerated.java => FirNativePartialLinkageTestGenerated.java} (98%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/{K1KlibABITestGenerated.java => K1NativePartialLinkageTestGenerated.java} (98%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/{AbstractNativeKlibABITest.kt => AbstractNativePartialLinkageTest.kt} (91%) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/KlibABITestUtils.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/PartialLinkageTestUtils.kt similarity index 95% rename from compiler/tests-common/tests/org/jetbrains/kotlin/klib/KlibABITestUtils.kt rename to compiler/tests-common/tests/org/jetbrains/kotlin/klib/PartialLinkageTestUtils.kt index ecd21f41510..34a65a27aa3 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/KlibABITestUtils.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/PartialLinkageTestUtils.kt @@ -6,14 +6,14 @@ package org.jetbrains.kotlin.klib import org.jetbrains.kotlin.codegen.* -import org.jetbrains.kotlin.klib.KlibABITestUtils.ModuleBuildDirs.Companion.OUTPUT_DIR_NAME -import org.jetbrains.kotlin.klib.KlibABITestUtils.ModuleBuildDirs.Companion.SOURCE_DIR_NAME +import org.jetbrains.kotlin.klib.PartialLinkageTestUtils.ModuleBuildDirs.Companion.OUTPUT_DIR_NAME +import org.jetbrains.kotlin.klib.PartialLinkageTestUtils.ModuleBuildDirs.Companion.SOURCE_DIR_NAME import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.fail import java.io.File -object KlibABITestUtils { +object PartialLinkageTestUtils { interface TestConfiguration { val testDir: File val buildDir: File @@ -93,9 +93,9 @@ object KlibABITestUtils { // Populate the source dir with *.kt files. copySources(from = moduleTestDir, to = moduleBuildDirs.sourceDir) - // Include ABI utils into the main module. + // Include PL utils into the main module. if (moduleName == MAIN_MODULE_NAME) { - val utilsDir = testDir.parentFile.resolve(ABI_UTILS_DIR) + val utilsDir = testDir.parentFile.resolve(PL_UTILS_DIR) KtUsefulTestCase.assertExists(utilsDir) copySources(from = utilsDir, to = moduleBuildDirs.sourceDir) { contents -> @@ -208,6 +208,6 @@ object KlibABITestUtils { ) const val MAIN_MODULE_NAME = "main" - private const val ABI_UTILS_DIR = "__utils__" + private const val PL_UTILS_DIR = "__utils__" private const val TEST_MODE_PLACEHOLDER = "TestMode.__UNKNOWN__" } diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index 79784d4391c..ff265e0c785 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -38,12 +38,12 @@ fun main(args: Array) { } testGroup("js/js.tests/tests-gen", "compiler/testData") { - testClass { + testClass { model("klibABI/", pattern = "^([^_](.+))$", targetBackend = TargetBackend.JS_IR, recursive = false, ) } } testGroup("js/js.tests/tests-gen", "compiler/testData") { - testClass { + testClass { model("klibABI/", pattern = "^([^_](.+))$", targetBackend = TargetBackend.JS_IR, recursive = false, ) } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsKLibABITestCase.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsPartialLinkageTestCase.kt similarity index 88% rename from js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsKLibABITestCase.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsPartialLinkageTestCase.kt index fe5c7ad75e6..d398b47d42c 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsKLibABITestCase.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsPartialLinkageTestCase.kt @@ -30,8 +30,8 @@ import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImplForJsIC import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.js.config.JSConfigurationKeys import org.jetbrains.kotlin.js.testOld.V8IrJsTestChecker -import org.jetbrains.kotlin.klib.KlibABITestUtils -import org.jetbrains.kotlin.klib.KlibABITestUtils.MAIN_MODULE_NAME +import org.jetbrains.kotlin.klib.PartialLinkageTestUtils +import org.jetbrains.kotlin.klib.PartialLinkageTestUtils.MAIN_MODULE_NAME import org.jetbrains.kotlin.konan.file.ZipFileSystemCacheableAccessor import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtFile @@ -40,15 +40,15 @@ import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import java.io.File import kotlin.io.path.createTempDirectory -abstract class AbstractJsKLibABIWithICTestCase : AbstractJsKLibABITestCase() { +abstract class AbstractJsPartialLinkageWithICTestCase : AbstractJsPartialLinkageTestCase() { override val useIncrementalCompiler get() = true } -abstract class AbstractJsKLibABINoICTestCase : AbstractJsKLibABITestCase() { +abstract class AbstractJsPartialLinkageNoICTestCase : AbstractJsPartialLinkageTestCase() { override val useIncrementalCompiler get() = false } -abstract class AbstractJsKLibABITestCase : KtUsefulTestCase() { +abstract class AbstractJsPartialLinkageTestCase : KtUsefulTestCase() { abstract val useIncrementalCompiler: Boolean private lateinit var buildDir: File @@ -86,17 +86,17 @@ abstract class AbstractJsKLibABITestCase : KtUsefulTestCase() { return config } - private inner class JsTestConfiguration(testPath: String) : KlibABITestUtils.TestConfiguration { + private inner class JsTestConfiguration(testPath: String) : PartialLinkageTestUtils.TestConfiguration { override val testDir: File = File(testPath).absoluteFile - override val buildDir: File get() = this@AbstractJsKLibABITestCase.buildDir + override val buildDir: File get() = this@AbstractJsPartialLinkageTestCase.buildDir override val stdlibFile: File get() = File("libraries/stdlib/js-ir/build/classes/kotlin/js/main").absoluteFile - override val testModeName = if (this@AbstractJsKLibABITestCase.useIncrementalCompiler) "JS_WITH_IC" else "JS_NO_IC" + override val testModeName = if (this@AbstractJsPartialLinkageTestCase.useIncrementalCompiler) "JS_WITH_IC" else "JS_NO_IC" - override fun buildKlib(moduleName: String, moduleSourceDir: File, dependencies: KlibABITestUtils.Dependencies, klibFile: File) = - this@AbstractJsKLibABITestCase.buildKlib(moduleName, moduleSourceDir, dependencies, klibFile) + override fun buildKlib(moduleName: String, moduleSourceDir: File, dependencies: PartialLinkageTestUtils.Dependencies, klibFile: File) = + this@AbstractJsPartialLinkageTestCase.buildKlib(moduleName, moduleSourceDir, dependencies, klibFile) - override fun buildBinaryAndRun(mainModuleKlibFile: File, dependencies: KlibABITestUtils.Dependencies) = - this@AbstractJsKLibABITestCase.buildBinaryAndRun(mainModuleKlibFile, dependencies) + override fun buildBinaryAndRun(mainModuleKlibFile: File, dependencies: PartialLinkageTestUtils.Dependencies) = + this@AbstractJsPartialLinkageTestCase.buildBinaryAndRun(mainModuleKlibFile, dependencies) override fun onNonEmptyBuildDirectory(directory: File) { zipAccessor.reset() @@ -109,9 +109,9 @@ abstract class AbstractJsKLibABITestCase : KtUsefulTestCase() { } // The entry point to generated test classes. - fun doTest(testPath: String) = KlibABITestUtils.runTest(JsTestConfiguration(testPath)) + fun doTest(testPath: String) = PartialLinkageTestUtils.runTest(JsTestConfiguration(testPath)) - private fun buildKlib(moduleName: String, moduleSourceDir: File, dependencies: KlibABITestUtils.Dependencies, klibFile: File) { + private fun buildKlib(moduleName: String, moduleSourceDir: File, dependencies: PartialLinkageTestUtils.Dependencies, klibFile: File) { val config = createConfig(moduleName) val ktFiles = environment.createPsiFiles(moduleSourceDir) @@ -157,7 +157,7 @@ abstract class AbstractJsKLibABITestCase : KtUsefulTestCase() { } } - private fun buildBinaryAndRun(mainModuleKlibFile: File, allDependencies: KlibABITestUtils.Dependencies) { + private fun buildBinaryAndRun(mainModuleKlibFile: File, allDependencies: PartialLinkageTestUtils.Dependencies) { val configuration = createConfig(MAIN_MODULE_NAME) val compilationOutputs = if (useIncrementalCompiler) @@ -176,7 +176,7 @@ abstract class AbstractJsKLibABITestCase : KtUsefulTestCase() { private fun buildBinaryWithIC( configuration: CompilerConfiguration, mainModuleKlibFile: File, - allDependencies: KlibABITestUtils.Dependencies + allDependencies: PartialLinkageTestUtils.Dependencies ): CompilationOutputs { // TODO: what about friend dependencies? val cacheUpdater = CacheUpdater( @@ -208,7 +208,7 @@ abstract class AbstractJsKLibABITestCase : KtUsefulTestCase() { private fun buildBinaryNoIC( configuration: CompilerConfiguration, mainModuleKlibFile: File, - allDependencies: KlibABITestUtils.Dependencies + allDependencies: PartialLinkageTestUtils.Dependencies ): CompilationOutputs { val klib = MainModule.Klib(mainModuleKlibFile.path) val moduleStructure = ModulesStructure( diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsKLibABINoICTestCaseGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsPartialLinkageNoICTestCaseGenerated.java similarity index 98% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsKLibABINoICTestCaseGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsPartialLinkageNoICTestCaseGenerated.java index c6cf5139576..265eddf8846 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsKLibABINoICTestCaseGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsPartialLinkageNoICTestCaseGenerated.java @@ -21,7 +21,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/klibABI") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JsKLibABINoICTestCaseGenerated extends AbstractJsKLibABINoICTestCase { +public class JsPartialLinkageNoICTestCaseGenerated extends AbstractJsPartialLinkageNoICTestCase { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsKLibABIWithICTestCaseGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsPartialLinkageWithICTestCaseGenerated.java similarity index 98% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsKLibABIWithICTestCaseGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsPartialLinkageWithICTestCaseGenerated.java index 736dec62362..17f98de9ca3 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsKLibABIWithICTestCaseGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsPartialLinkageWithICTestCaseGenerated.java @@ -21,7 +21,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/klibABI") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JsKLibABIWithICTestCaseGenerated extends AbstractJsKLibABIWithICTestCase { +public class JsPartialLinkageWithICTestCaseGenerated extends AbstractJsPartialLinkageWithICTestCase { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JS_IR, testDataFilePath); } diff --git a/native/native.tests/build.gradle.kts b/native/native.tests/build.gradle.kts index ce76d96bf60..dce98d9c342 100644 --- a/native/native.tests/build.gradle.kts +++ b/native/native.tests/build.gradle.kts @@ -52,7 +52,7 @@ val stdlibTest = nativeTest("stdlibTest", "stdlib") val stdlibK2Test = nativeTest("stdlibK2Test", "stdlibK2") val kotlinTestLibraryTest = nativeTest("kotlinTestLibraryTest", "kotlin-test") val kotlinTestK2LibraryTest = nativeTest("kotlinTestK2LibraryTest", "kotlin-testK2") -val klibAbiTest = nativeTest("klibAbiTest", "klib-abi") +val partialLinkageTest = nativeTest("partialLinkageTest", "partial-linkage") val klibBinaryCompatibilityTest = nativeTest("klibBinaryCompatibilityTest", "klib-binary-compatibility") val cinteropTest = nativeTest("cinteropTest", "cinterop") val debuggerTest = nativeTest("debuggerTest", "debugger") diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirKlibABITestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativePartialLinkageTestGenerated.java similarity index 98% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirKlibABITestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativePartialLinkageTestGenerated.java index 8bbdbf6c66c..bcdd2b0c8ee 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirKlibABITestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativePartialLinkageTestGenerated.java @@ -20,7 +20,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/klibABI") @TestDataPath("$PROJECT_ROOT") @FirPipeline() -public class FirKlibABITestGenerated extends AbstractNativeKlibABITest { +public class FirNativePartialLinkageTestGenerated extends AbstractNativePartialLinkageTest { @Test @TestMetadata("addEnumEntry") public void testAddEnumEntry() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1KlibABITestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativePartialLinkageTestGenerated.java similarity index 98% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1KlibABITestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativePartialLinkageTestGenerated.java index d6f5acf70ff..3769fdd00da 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1KlibABITestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativePartialLinkageTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/klibABI") @TestDataPath("$PROJECT_ROOT") -public class K1KlibABITestGenerated extends AbstractNativeKlibABITest { +public class K1NativePartialLinkageTestGenerated extends AbstractNativePartialLinkageTest { @Test @TestMetadata("addEnumEntry") public void testAddEnumEntry() throws Exception { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt index 68298fddae2..3f64f25d298 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt @@ -53,15 +53,15 @@ fun main() { } } - // KLIB ABI tests. + // Partial linkage tests. testGroup("native/native.tests/tests-gen", "compiler/testData") { - testClass( - suiteTestClassName = "K1KlibABITestGenerated" + testClass( + suiteTestClassName = "K1NativePartialLinkageTestGenerated" ) { model("klibABI/", pattern = "^([^_](.+))$", recursive = false) } - testClass( - suiteTestClassName = "FirKlibABITestGenerated", + testClass( + suiteTestClassName = "FirNativePartialLinkageTestGenerated", annotations = listOf(provider()) ) { model("klibABI/", pattern = "^([^_](.+))$", recursive = false) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibBinaryCompatibilityTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibBinaryCompatibilityTest.kt index db990a7b6aa..e5a87267def 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibBinaryCompatibilityTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibBinaryCompatibilityTest.kt @@ -28,7 +28,6 @@ import kotlin.math.max import org.jetbrains.kotlin.compatibility.binary.TestFile as BinaryCompatibilityTestFile import org.jetbrains.kotlin.compatibility.binary.TestModule as BinaryCompatibilityTestModule -@Tag("klib-abi") @Tag("klib-binary-compatibility") abstract class AbstractNativeKlibBinaryCompatibilityTest : AbstractNativeSimpleTest() { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativePartialLinkageTest.kt similarity index 91% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativePartialLinkageTest.kt index b99fc4cd695..feaa3322eb7 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativePartialLinkageTest.kt @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.konan.blackboxtest import com.intellij.testFramework.TestDataFile import org.jetbrains.kotlin.codegen.ProjectInfo -import org.jetbrains.kotlin.klib.KlibABITestUtils -import org.jetbrains.kotlin.klib.KlibABITestUtils.Dependencies -import org.jetbrains.kotlin.klib.KlibABITestUtils.MAIN_MODULE_NAME +import org.jetbrains.kotlin.klib.PartialLinkageTestUtils +import org.jetbrains.kotlin.klib.PartialLinkageTestUtils.Dependencies +import org.jetbrains.kotlin.klib.PartialLinkageTestUtils.MAIN_MODULE_NAME import org.jetbrains.kotlin.konan.blackboxtest.support.* import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.WithTestRunnerExtras import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.* @@ -24,12 +24,12 @@ import org.junit.jupiter.api.Tag import org.opentest4j.TestAbortedException import java.io.File -@Tag("klib-abi") -abstract class AbstractNativeKlibABITest : AbstractNativeSimpleTest() { - private inner class NativeTestConfiguration(testPath: String) : KlibABITestUtils.TestConfiguration { +@Tag("partial-linkage") +abstract class AbstractNativePartialLinkageTest : AbstractNativeSimpleTest() { + private inner class NativeTestConfiguration(testPath: String) : PartialLinkageTestUtils.TestConfiguration { override val testDir = getAbsoluteFile(testPath) - override val buildDir get() = this@AbstractNativeKlibABITest.buildDir - override val stdlibFile get() = this@AbstractNativeKlibABITest.stdlibFile + override val buildDir get() = this@AbstractNativePartialLinkageTest.buildDir + override val stdlibFile get() = this@AbstractNativePartialLinkageTest.stdlibFile override val testModeName = with(testRunSettings.get()) { val cacheModeAlias = when { @@ -47,10 +47,10 @@ abstract class AbstractNativeKlibABITest : AbstractNativeSimpleTest() { } override fun buildKlib(moduleName: String, moduleSourceDir: File, dependencies: Dependencies, klibFile: File) = - this@AbstractNativeKlibABITest.buildKlib(moduleName, moduleSourceDir, dependencies, klibFile) + this@AbstractNativePartialLinkageTest.buildKlib(moduleName, moduleSourceDir, dependencies, klibFile) override fun buildBinaryAndRun(mainModuleKlibFile: File, dependencies: Dependencies) = - this@AbstractNativeKlibABITest.buildBinaryAndRun(dependencies) + this@AbstractNativePartialLinkageTest.buildBinaryAndRun(dependencies) override fun onNonEmptyBuildDirectory(directory: File) = backupDirectoryContents(directory) @@ -70,13 +70,13 @@ abstract class AbstractNativeKlibABITest : AbstractNativeSimpleTest() { private val producedKlibs = linkedSetOf() // IMPORTANT: The order makes sense! private val executableArtifact: Executable by lazy { - val (_, outputDir) = KlibABITestUtils.createModuleDirs(buildDir, LAUNCHER_MODULE_NAME) + val (_, outputDir) = PartialLinkageTestUtils.createModuleDirs(buildDir, LAUNCHER_MODULE_NAME) val executableFile = outputDir.resolve("app." + testRunSettings.get().testTarget.family.exeSuffix) Executable(executableFile) } // The entry point to generated test classes. - protected fun runTest(@TestDataFile testPath: String) = KlibABITestUtils.runTest(NativeTestConfiguration(testPath)) + protected fun runTest(@TestDataFile testPath: String) = PartialLinkageTestUtils.runTest(NativeTestConfiguration(testPath)) private fun customizeMainModuleSources(moduleSourceDir: File) { // Add a "box" function launcher to the main module. @@ -153,7 +153,7 @@ abstract class AbstractNativeKlibABITest : AbstractNativeSimpleTest() { TestModule.Exclusive( name = moduleName, directDependencySymbols = emptySet(), /* Don't need to pass any dependency symbols here. - Dependencies are already handled by the AbstractKlibABITestCase class. */ + Dependencies are already handled by the AbstractNativePartialLinkageTest class. */ directFriendSymbols = emptySet(), directDependsOnSymbols = emptySet(), ).also { module ->