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

[Native][tests] Drop obsolete EXPECT_ACTUAL_LINKER test directive

Browse Source 
This directive was earlier used in KMP tests that were rewritten
and do not require this directive anymore.

^KT-61136
This commit is contained in:
Dmitriy Dolovov
2023-09-15 19:52:09 +02:00
committed by Space Team
parent 249106b23f
commit 70d12b271d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt
-4
View File
@@ -125,7 +125,6 @@ private class ExtTestDataFile(
}, },
optInsForSourceCode = optInsForSourceCode + structure.directives.multiValues(USE_EXPERIMENTAL_DIRECTIVE), optInsForSourceCode = optInsForSourceCode + structure.directives.multiValues(USE_EXPERIMENTAL_DIRECTIVE),
optInsForCompiler = optInsForCompiler, optInsForCompiler = optInsForCompiler,
expectActualLinker = EXPECT_ACTUAL_LINKER_DIRECTIVE in structure.directives,
generatedSourcesDir = computeGeneratedSourcesDir( generatedSourcesDir = computeGeneratedSourcesDir(
testDataBaseDir = testRoots.baseDir, testDataBaseDir = testRoots.baseDir,
testDataFile = testDataFile, testDataFile = testDataFile,
@@ -182,7 +181,6 @@ private class ExtTestDataFile(
testDataFileSettings.languageSettings.sorted().mapTo(args) { "-XXLanguage:$it" } testDataFileSettings.languageSettings.sorted().mapTo(args) { "-XXLanguage:$it" }
testDataFileSettings.optInsForCompiler.sorted().mapTo(args) { "-opt-in=$it" } testDataFileSettings.optInsForCompiler.sorted().mapTo(args) { "-opt-in=$it" }
args += "-opt-in=kotlin.native.internal.InternalForKotlinNativeTests" // for ReflectionPackageName args += "-opt-in=kotlin.native.internal.InternalForKotlinNativeTests" // for ReflectionPackageName
if (testDataFileSettings.expectActualLinker) args += "-Xexpect-actual-linker"
return TestCompilerArgs(args) return TestCompilerArgs(args)
} }
@@ -555,7 +553,6 @@ private class ExtTestDataFile(
"-UseCorrectExecutionOrderForVarargArguments" // Run only correct one "-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 USE_EXPERIMENTAL_DIRECTIVE = "USE_EXPERIMENTAL"
private const val NATIVE_STANDALONE_DIRECTIVE = "NATIVE_STANDALONE" private const val NATIVE_STANDALONE_DIRECTIVE = "NATIVE_STANDALONE"
@@ -581,7 +578,6 @@ private class ExtTestDataFileSettings(
val languageSettings: Set<String>, val languageSettings: Set<String>,
val optInsForSourceCode: Set<String>, val optInsForSourceCode: Set<String>,
val optInsForCompiler: Set<String>, val optInsForCompiler: Set<String>,
val expectActualLinker: Boolean,
val generatedSourcesDir: File, val generatedSourcesDir: File,
val nominalPackageName: PackageName val nominalPackageName: PackageName
) )