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

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

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