Revert "Temporary: mute PRE_RELEASE_CLASS in some tests (KT-66551)"

This reverts commit 893e5cac
This commit is contained in:
Mikhail Glukhikh
2024-03-14 21:35:33 +01:00
committed by Space Team
parent e22a2016b1
commit 8ac576614f
9 changed files with 3 additions and 25 deletions
@@ -59,7 +59,6 @@ internal object CompilerExecutor {
val extraOptions = buildList { val extraOptions = buildList {
addAll(options) addAll(options)
add("-XXLanguage:-${LanguageFeature.SkipStandaloneScriptsInSourceRoots.name}") add("-XXLanguage:-${LanguageFeature.SkipStandaloneScriptsInSourceRoots.name}")
add("-Xskip-prerelease-check")
} }
MockLibraryUtil.compileLibraryToJar( MockLibraryUtil.compileLibraryToJar(
@@ -27,7 +27,6 @@ class ProgramWithDependencyOnCompiler(
K2JVMCompiler(), K2JVMCompiler(),
listOf( listOf(
programSource.path, programSource.path,
"-Xskip-prerelease-check",
"-d", program.absolutePath, "-d", program.absolutePath,
"-cp", PathUtil.kotlinPathsForDistDirectory.compilerPath.absolutePath, "-cp", PathUtil.kotlinPathsForDistDirectory.compilerPath.absolutePath,
), ),
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.js.test.fir.AbstractFirLoadK2CompiledJsKotlinTest
import org.jetbrains.kotlin.test.backend.handlers.IrPrettyKotlinDumpHandler import org.jetbrains.kotlin.test.backend.handlers.IrPrettyKotlinDumpHandler
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.builders.configureIrHandlersStep import org.jetbrains.kotlin.test.builders.configureIrHandlersStep
import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP
import org.jetbrains.kotlin.test.runners.AbstractFirLoadK2CompiledJvmKotlinTest import org.jetbrains.kotlin.test.runners.AbstractFirLoadK2CompiledJvmKotlinTest
@@ -59,7 +58,6 @@ fun TestConfigurationBuilder.commonFirWithPluginFrontendConfiguration() {
defaultDirectives { defaultDirectives {
+ENABLE_PLUGIN_PHASES +ENABLE_PLUGIN_PHASES
+FIR_DUMP +FIR_DUMP
DIAGNOSTICS with "-PRE_RELEASE_CLASS"
} }
useConfigurators( useConfigurators(
@@ -30,6 +30,6 @@ abstract class AbstractFirJsPlainObjectsPluginDiagnosticTest : AbstractFirPsiDia
private fun TestConfigurationBuilder.disableOptInErrors() { private fun TestConfigurationBuilder.disableOptInErrors() {
defaultDirectives { defaultDirectives {
DIAGNOSTICS with listOf("-OPT_IN_USAGE", "-OPT_IN_USAGE_ERROR", "-PRE_RELEASE_CLASS") DIAGNOSTICS with listOf("-OPT_IN_USAGE", "-OPT_IN_USAGE_ERROR")
} }
} }
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.parcelize.test.runners
import org.jetbrains.kotlin.parcelize.test.services.ParcelizeEnvironmentConfigurator import org.jetbrains.kotlin.parcelize.test.services.ParcelizeEnvironmentConfigurator
import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.FirParser
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor
import org.jetbrains.kotlin.test.frontend.fir.handlers.FirIdenticalChecker import org.jetbrains.kotlin.test.frontend.fir.handlers.FirIdenticalChecker
@@ -25,7 +24,6 @@ abstract class AbstractFirParcelizeDiagnosticTestBase(val parser: FirParser) : A
defaultDirectives { defaultDirectives {
+FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES +FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
FirDiagnosticsDirectives.FIR_PARSER with parser FirDiagnosticsDirectives.FIR_PARSER with parser
DIAGNOSTICS with "-PRE_RELEASE_CLASS"
} }
useConfigurators(::ParcelizeEnvironmentConfigurator) useConfigurators(::ParcelizeEnvironmentConfigurator)
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.test.builders.configureClassicFrontendHandlersStep
import org.jetbrains.kotlin.test.builders.configureFirHandlersStep import org.jetbrains.kotlin.test.builders.configureFirHandlersStep
import org.jetbrains.kotlin.test.builders.configureIrHandlersStep import org.jetbrains.kotlin.test.builders.configureIrHandlersStep
import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.REQUIRES_SEPARATE_PROCESS import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.REQUIRES_SEPARATE_PROCESS
import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
@@ -53,7 +52,6 @@ abstract class AbstractParcelizeBoxTestBase<R : ResultingArtifact.FrontendOutput
defaultDirectives { defaultDirectives {
+REQUIRES_SEPARATE_PROCESS +REQUIRES_SEPARATE_PROCESS
+REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO +REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO
DIAGNOSTICS with "-PRE_RELEASE_CLASS"
} }
commonConfigurationForTest(targetFrontend, frontendFacade, frontendToBackendConverter, backendFacade) commonConfigurationForTest(targetFrontend, frontendFacade, frontendToBackendConverter, backendFacade)
@@ -31,7 +31,7 @@ abstract class AbstractParcelizeDiagnosticTest : AbstractKotlinCompilerTest() {
defaultDirectives { defaultDirectives {
+USE_PSI_CLASS_FILES_READING +USE_PSI_CLASS_FILES_READING
DIAGNOSTICS with listOf("-UNUSED_PARAMETER", "-PRE_RELEASE_CLASS") DIAGNOSTICS with "-UNUSED_PARAMETER"
} }
enableMetaInfoHandler() enableMetaInfoHandler()
@@ -9,7 +9,6 @@ package org.jetbrains.kotlin.scripting.compiler.plugin
import com.intellij.openapi.Disposable import com.intellij.openapi.Disposable
import junit.framework.TestCase import junit.framework.TestCase
import org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettings
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots
@@ -26,14 +25,11 @@ import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
import org.jetbrains.kotlin.config.AnalysisFlags
import org.jetbrains.kotlin.config.ApiVersion
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.scripting.compiler.plugin.impl.SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY import org.jetbrains.kotlin.scripting.compiler.plugin.impl.SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY
import org.jetbrains.kotlin.scripting.compiler.plugin.impl.reporter import org.jetbrains.kotlin.scripting.compiler.plugin.impl.reporter
import org.jetbrains.kotlin.scripting.compiler.plugin.impl.updateWithCompilerOptions
import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys
import org.jetbrains.kotlin.scripting.definitions.SCRIPT_DEFINITION_MARKERS_PATH import org.jetbrains.kotlin.scripting.definitions.SCRIPT_DEFINITION_MARKERS_PATH
import org.jetbrains.kotlin.scripting.definitions.discoverScriptTemplatesInClasspath import org.jetbrains.kotlin.scripting.definitions.discoverScriptTemplatesInClasspath
@@ -127,14 +123,6 @@ class ScriptingCompilerPluginTest : TestCase() {
createEnvironment(defClasses.map { File(defsSrc, "$it.kt").canonicalPath }, defsOut, messageCollector, disposable) { createEnvironment(defClasses.map { File(defsSrc, "$it.kt").canonicalPath }, defsOut, messageCollector, disposable) {
addJvmClasspathRoots(runtimeClasspath) addJvmClasspathRoots(runtimeClasspath)
addJvmClasspathRoots(scriptingClasspath) addJvmClasspathRoots(scriptingClasspath)
put(
CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS,
CompilerTestLanguageVersionSettings(
emptyMap(), ApiVersion.LATEST_STABLE, LanguageVersion.LATEST_STABLE, mapOf(
AnalysisFlags.skipPrereleaseCheck to true
)
)
)
} }
) )
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.scripting.test
import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.FirParser
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.ConfigurationDirectives.WITH_STDLIB import org.jetbrains.kotlin.test.directives.ConfigurationDirectives.WITH_STDLIB
import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestBase import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestBase
import org.jetbrains.kotlin.test.runners.codegen.AbstractFirScriptCodegenTest import org.jetbrains.kotlin.test.runners.codegen.AbstractFirScriptCodegenTest
@@ -37,6 +36,5 @@ fun TestConfigurationBuilder.configureWithCustomScriptDef() {
) )
defaultDirectives { defaultDirectives {
+WITH_STDLIB +WITH_STDLIB
DIAGNOSTICS with "-PRE_RELEASE_CLASS"
} }
} }