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

LV 2.0: prevent double-set of LV in Native compilation tests

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-09-07 11:08:53 +02:00
committed by Space Team
parent d8b3dd683e
commit bbdaa8c3ff
2 changed files with 6 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/CompilerOutputTest.kt
+1
View File
@@ -71,6 +71,7 @@ class CompilerOutputTest : AbstractNativeSimpleTest() {
): TestCompilationResult<out TestCompilationArtifact.KLIB> { ): TestCompilationResult<out TestCompilationArtifact.KLIB> {
val testCase = generateTestCaseWithSingleModule(source, TestCompilerArgs(freeCompilerArgs)) val testCase = generateTestCaseWithSingleModule(source, TestCompilerArgs(freeCompilerArgs))
val compilation = LibraryCompilation( val compilation = LibraryCompilation(
pipelineType = null,
settings = testRunSettings, settings = testRunSettings,
freeCompilerArgs = testCase.freeCompilerArgs, freeCompilerArgs = testCase.freeCompilerArgs,
sourceModules = testCase.modules, sourceModules = testCase.modules,
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt
+5 -4
View File
@@ -139,7 +139,7 @@ internal abstract class SourceBasedCompilation<A : TestCompilationArtifact>(
private val gcType: GCType, private val gcType: GCType,
private val gcScheduler: GCScheduler, private val gcScheduler: GCScheduler,
private val allocator: Allocator, private val allocator: Allocator,
private val pipelineType: PipelineType, private val pipelineType: PipelineType?,
freeCompilerArgs: TestCompilerArgs, freeCompilerArgs: TestCompilerArgs,
compilerPlugins: CompilerPlugins, compilerPlugins: CompilerPlugins,
override val sourceModules: Collection<TestModule>, override val sourceModules: Collection<TestModule>,
@@ -162,7 +162,7 @@ internal abstract class SourceBasedCompilation<A : TestCompilationArtifact>(
sanitizer.compilerFlag?.let { compilerFlag -> add(compilerFlag) } sanitizer.compilerFlag?.let { compilerFlag -> add(compilerFlag) }
gcType.compilerFlag?.let { compilerFlag -> add(compilerFlag) } gcType.compilerFlag?.let { compilerFlag -> add(compilerFlag) }
gcScheduler.compilerFlag?.let { compilerFlag -> add(compilerFlag) } gcScheduler.compilerFlag?.let { compilerFlag -> add(compilerFlag) }
pipelineType.compilerFlags.forEach { compilerFlag -> add(compilerFlag) } pipelineType?.compilerFlags?.forEach { compilerFlag -> add(compilerFlag) }
applyK2MPPArgs(this) applyK2MPPArgs(this)
} }
@@ -191,7 +191,8 @@ internal class LibraryCompilation(
freeCompilerArgs: TestCompilerArgs, freeCompilerArgs: TestCompilerArgs,
sourceModules: Collection<TestModule>, sourceModules: Collection<TestModule>,
dependencies: Iterable<TestCompilationDependency<*>>, dependencies: Iterable<TestCompilationDependency<*>>,
expectedArtifact: KLIB expectedArtifact: KLIB,
pipelineType: PipelineType? = settings.get(),
) : SourceBasedCompilation<KLIB>( ) : SourceBasedCompilation<KLIB>(
targets = settings.get(), targets = settings.get(),
home = settings.get(), home = settings.get(),
@@ -203,7 +204,7 @@ internal class LibraryCompilation(
gcType = settings.get(), gcType = settings.get(),
gcScheduler = settings.get(), gcScheduler = settings.get(),
allocator = settings.get(), allocator = settings.get(),
pipelineType = settings.get(), pipelineType = pipelineType,
freeCompilerArgs = freeCompilerArgs, freeCompilerArgs = freeCompilerArgs,
compilerPlugins = settings.get(), compilerPlugins = settings.get(),
sourceModules = sourceModules, sourceModules = sourceModules,