From c667340261c70b7540027e8f90b8c767eb32f8bd Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 26 Jun 2018 20:28:05 +0300 Subject: [PATCH] Allow pre-release compiler reading pre-release binaries in tests Pre-release compiler should be able to read pre-release binaries in tests even if a stable language version is used, otherwise no stdlib API can be read. --- .../kotlin/checkers/CompilerTestLanguageVersionSettings.kt | 2 +- .../org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt index 38ca5ef353e..5f8b5b40fb5 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt @@ -34,7 +34,7 @@ data class CompilerTestLanguageVersionSettings( override fun getFeatureSupport(feature: LanguageFeature): LanguageFeature.State = languageFeatures[feature] ?: delegate.getFeatureSupport(feature) - override fun isPreRelease(): Boolean = languageVersion.isPreRelease() + override fun isPreRelease(): Boolean = KotlinCompilerVersion.isPreRelease() @Suppress("UNCHECKED_CAST") override fun getFlag(flag: AnalysisFlag): T = analysisFlags[flag] as T? ?: flag.defaultValue diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt index c7bf8b369ed..8cbebc69d04 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.config.ApiVersion +import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl import org.jetbrains.kotlin.load.kotlin.loadModuleMapping @@ -44,7 +45,7 @@ class JvmModuleProtoBufTest : KtUsefulTestCase() { "-d", tmpdir.path, "-module-name", moduleName, "-language-version", compileWith.versionString - ) + extraOptions) + ) + extraOptions + listOfNotNull("-Xskip-metadata-version-check".takeIf { KotlinCompilerVersion.isPreRelease() })) val mapping = ModuleMapping.loadModuleMapping( File(tmpdir, "META-INF/$moduleName.${ModuleMapping.MAPPING_FILE_EXT}").readBytes(), "test",