[K/N] Don't pass -language_version to the second stage of new test system.

^KT-56182
Merge-request: KT-MR-10414
Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
This commit is contained in:
Vladimir Sukharev
2023-06-05 17:59:16 +00:00
committed by Space Team
parent 833b5c12a1
commit 37adc99b9a
3 changed files with 21 additions and 16 deletions
@@ -226,7 +226,7 @@ internal class ObjCFrameworkCompilation(
sanitizer = settings.get(),
gcType = settings.get(),
gcScheduler = settings.get(),
pipelineType = settings.get(),
pipelineType = settings.getStageDependentPipelineType(),
freeCompilerArgs = freeCompilerArgs,
sourceModules = sourceModules,
dependencies = CategorizedDependencies(dependencies),
@@ -310,7 +310,7 @@ internal class ExecutableCompilation(
sanitizer = settings.get(),
gcType = settings.get(),
gcScheduler = settings.get(),
pipelineType = settings.get(),
pipelineType = settings.getStageDependentPipelineType(),
freeCompilerArgs = freeCompilerArgs,
sourceModules = sourceModules,
dependencies = CategorizedDependencies(dependencies),
@@ -506,3 +506,9 @@ private object BinaryOptions {
fun chooseFor(cacheMode: CacheMode) = if (cacheMode.useStaticCacheForDistributionLibraries) forUseWithCache else defaultForTesting
}
}
internal fun Settings.getStageDependentPipelineType(): PipelineType =
when (get<TestMode>()) {
TestMode.ONE_STAGE_MULTI_MODULE -> get<PipelineType>()
TestMode.TWO_STAGE_MULTI_MODULE -> PipelineType.K1 // Don't pass "-language_version 2.0" to the second stage
}