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

Drop all usages of WITH_RUNTIME directive

Browse Source
This commit is contained in:
Ivan Kylchik
2021-11-25 17:41:34 +03:00
committed by TeamCityServer
parent 1874318954
commit b131c52889
24 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/ConfigurationDirectives.kt
+1 -7
View File
@@ -12,11 +12,5 @@ object ConfigurationDirectives : SimpleDirectivesContainer() {
"List of kotlin configuration flags"
)
val WITH_RUNTIME by directive(
description = """
Add Kotlin stdlib to classpath
This directive is deprecated, use WITH_STDLIB instead
""".trimIndent()
)
val WITH_STDLIB by directive("Add Kotlin runtime to classpath")
val WITH_STDLIB by directive("Add Kotlin stdlib to classpath")
}
compiler/testData/codegen/box/collections/removeClashWithGenerics.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// TARGET_BACKEND: JVM
// WITH_RUNTUME
// WITH_STDLIB
// See also: KT-42083
compiler/testData/codegen/bytecodeListing/contextReceivers/fromKEEP/monoidSum.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: JVM
// WITH_RUNTIME
// WITH_STDLIB
interface Semigroup<T> {
infix fun T.combine(other: T): T
compiler/testData/diagnostics/tests/checkArguments/kt49276.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// WITH_RUNTIME
// WITH_STDLIB
fun <E> SmartList(x: E) {}
fun <E> SmartList(x: Collection<E>) {}
compiler/testData/diagnostics/tests/checkArguments/kt49276.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// WITH_RUNTIME
// WITH_STDLIB
fun <E> SmartList(x: E) {}
fun <E> SmartList(x: Collection<E>) {}
compiler/testData/diagnostics/tests/checkArguments/kt49276Disabled.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// FIR_IDENTICAL
// !LANGUAGE: +DisableCheckingChangedProgressionsResolve
// WITH_RUNTIME
// WITH_STDLIB
fun <E> SmartList(x: E) {}
fun <E> SmartList(x: Collection<E>) {}
compiler/testData/diagnostics/tests/checkArguments/kt49276Error.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// WITH_RUNTIME
// WITH_STDLIB
// !LANGUAGE: +ProgressionsChangingResolve
fun <E> SmartList(x: E) {}
compiler/testData/diagnostics/tests/checkArguments/kt49276Error.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// WITH_RUNTIME
// WITH_STDLIB
// !LANGUAGE: +ProgressionsChangingResolve
fun <E> SmartList(x: E) {}
compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/decimateEveryEvenThird.fir.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// !LANGUAGE: +ContextReceivers
// WITH_RUNTIME
// WITH_STDLIB
fun List<Int>.decimateEveryEvenThird() = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>sequence<!> {
var counter = 1
compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/decimateEveryEvenThird.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// !LANGUAGE: +ContextReceivers
// WITH_RUNTIME
// WITH_STDLIB
fun List<Int>.decimateEveryEvenThird() = sequence {
var counter = 1
compiler/testData/diagnostics/tests/resolve/kt49736.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// WITH_RUNTIME
// WITH_STDLIB
import kotlin.collections.forEach as forEach1
compiler/testData/diagnostics/tests/resolve/kt49736.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// WITH_RUNTIME
// WITH_STDLIB
import kotlin.collections.forEach as forEach1
compiler/testData/diagnostics/tests/varargs/kt10926.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// WITH_RUNTIME
// WITH_STDLIB
class AllCollection2<T> {
fun <K, T> addAll(vararg values: T, values2: Array<K>) = "OK" // 1
compiler/testData/diagnostics/tests/varargs/kt10926.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// WITH_RUNTIME
// WITH_STDLIB
class AllCollection2<T> {
fun <K, T> addAll(vararg values: T, values2: Array<K>) = "OK" // 1
compiler/testData/diagnostics/tests/varargs/kt10926EnabledFeature.fir.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// !LANGUAGE: +EliminateAmbiguitiesWithExternalTypeParameters
// WITH_RUNTIME
// WITH_STDLIB
class AllCollection<T> {
fun <K, T> addAll(vararg values: T, values2: Array<K>) = "OK" // 1
compiler/testData/diagnostics/tests/varargs/kt10926EnabledFeature.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// !LANGUAGE: +EliminateAmbiguitiesWithExternalTypeParameters
// WITH_RUNTIME
// WITH_STDLIB
class AllCollection<T> {
fun <K, T> addAll(vararg values: T, values2: Array<K>) = "OK" // 1
compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/dp.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// !LANGUAGE: +ContextReceivers
// TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME
// WITH_STDLIB
class View {
val coefficient = 42
compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// !LANGUAGE: +ContextReceivers
// TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME
// WITH_STDLIB
interface Semigroup<T> {
infix fun T.combine(other: T): T
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
+1 -2
View File
@@ -140,8 +140,7 @@ class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigu
fun getRuntimePathsForModule(module: TestModule, testServices: TestServices): List<String> {
val result = mutableListOf<String>()
val needsFullIrRuntime = JsEnvironmentConfigurationDirectives.KJS_WITH_FULL_RUNTIME in module.directives ||
ConfigurationDirectives.WITH_STDLIB in module.directives ||
ConfigurationDirectives.WITH_RUNTIME in module.directives
ConfigurationDirectives.WITH_STDLIB in module.directives
val names = if (needsFullIrRuntime) listOf("full.stdlib", "kotlin.test") else listOf("reduced.stdlib")
names.mapTo(result) { System.getProperty("kotlin.js.$it.path") }
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
+5 -6
View File
@@ -71,16 +71,15 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
private const val JAVA_BINARIES_JAR_NAME = "java-binaries"
fun extractConfigurationKind(registeredDirectives: RegisteredDirectives): ConfigurationKind {
val withRuntime = ConfigurationDirectives.WITH_RUNTIME in registeredDirectives ||
ConfigurationDirectives.WITH_STDLIB in registeredDirectives
val withStdlib = ConfigurationDirectives.WITH_STDLIB in registeredDirectives
val withReflect = JvmEnvironmentConfigurationDirectives.WITH_REFLECT in registeredDirectives
val noRuntime = JvmEnvironmentConfigurationDirectives.NO_RUNTIME in registeredDirectives
if (noRuntime && withRuntime) {
error("NO_RUNTIME and WITH_RUNTIME can not be used together")
if (noRuntime && withStdlib) {
error("NO_RUNTIME and WITH_STDLIB can not be used together")
}
return when {
withRuntime && !withReflect -> ConfigurationKind.NO_KOTLIN_REFLECT
withRuntime || withReflect -> ConfigurationKind.ALL
withStdlib && !withReflect -> ConfigurationKind.NO_KOTLIN_REFLECT
withStdlib || withReflect -> ConfigurationKind.ALL
noRuntime -> ConfigurationKind.JDK_NO_RUNTIME
else -> ConfigurationKind.JDK_ONLY
}
compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt
-3
View File
@@ -64,9 +64,6 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() {
var addRuntime = false
var addReflect = false
for (file in files) {
if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_RUNTIME")) {
addRuntime = true
}
if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_STDLIB")) {
addRuntime = true
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt
-3
View File
@@ -194,9 +194,6 @@ abstract class KotlinBaseTest<F : KotlinBaseTest.TestFile> : KtUsefulTestCase()
var addRuntime = false
var addReflect = false
for (file in files) {
if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_RUNTIME")) {
addRuntime = true
}
if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_STDLIB")) {
addRuntime = true
}
compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt
+2 -3
View File
@@ -43,9 +43,8 @@ abstract class AbstractMultiPlatformIntegrationTest : KtUsefulTestCase() {
val tmpdir = KtTestUtil.tmpDir(getTestName(true))
val withRuntime = InTextDirectivesUtils.isDirectiveDefined(commonSrc.readText(), "WITH_RUNTIME") ||
InTextDirectivesUtils.isDirectiveDefined(commonSrc.readText(), "WITH_STDLIB")
val optionalStdlibCommon = if (withRuntime) arrayOf("-cp", findStdlibCommon().absolutePath) else emptyArray()
val withStdlib = InTextDirectivesUtils.isDirectiveDefined(commonSrc.readText(), "WITH_STDLIB")
val optionalStdlibCommon = if (withStdlib) arrayOf("-cp", findStdlibCommon().absolutePath) else emptyArray()
val commonDest = File(tmpdir, "common").absolutePath
val jvmDest = File(tmpdir, "jvm").absolutePath.takeIf { jvmSrc != null }
plugins/kotlin-serialization/kotlin-serialization-compiler/testData/boxIr/sealedInterfaces.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM_IR
// WITH_RUNTIME
// WITH_STDLIB
package a