From 70d12b271d4b39fa9dbacd6ee9bae1bc720baa1e Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 15 Sep 2023 19:52:09 +0200 Subject: [PATCH] [Native][tests] Drop obsolete EXPECT_ACTUAL_LINKER test directive This directive was earlier used in KMP tests that were rewritten and do not require this directive anymore. ^KT-61136 --- .../blackboxtest/support/group/ExtTestCaseGroupProvider.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt index de14a8c40af..fc3c5c2d73f 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt @@ -125,7 +125,6 @@ private class ExtTestDataFile( }, optInsForSourceCode = optInsForSourceCode + structure.directives.multiValues(USE_EXPERIMENTAL_DIRECTIVE), optInsForCompiler = optInsForCompiler, - expectActualLinker = EXPECT_ACTUAL_LINKER_DIRECTIVE in structure.directives, generatedSourcesDir = computeGeneratedSourcesDir( testDataBaseDir = testRoots.baseDir, testDataFile = testDataFile, @@ -182,7 +181,6 @@ private class ExtTestDataFile( testDataFileSettings.languageSettings.sorted().mapTo(args) { "-XXLanguage:$it" } testDataFileSettings.optInsForCompiler.sorted().mapTo(args) { "-opt-in=$it" } args += "-opt-in=kotlin.native.internal.InternalForKotlinNativeTests" // for ReflectionPackageName - if (testDataFileSettings.expectActualLinker) args += "-Xexpect-actual-linker" return TestCompilerArgs(args) } @@ -555,7 +553,6 @@ private class ExtTestDataFile( "-UseCorrectExecutionOrderForVarargArguments" // Run only correct one ) - private const val EXPECT_ACTUAL_LINKER_DIRECTIVE = "EXPECT_ACTUAL_LINKER" private const val USE_EXPERIMENTAL_DIRECTIVE = "USE_EXPERIMENTAL" private const val NATIVE_STANDALONE_DIRECTIVE = "NATIVE_STANDALONE" @@ -581,7 +578,6 @@ private class ExtTestDataFileSettings( val languageSettings: Set, val optInsForSourceCode: Set, val optInsForCompiler: Set, - val expectActualLinker: Boolean, val generatedSourcesDir: File, val nominalPackageName: PackageName )