Replace all occurrences of WITH_RUNTIME with WITH_STDLIB

We are going to deprecate `WITH_RUNTIME` directive. The main reason
behind this change is that `WITH_STDLIB` directive better describes
its meaning, specifically it will add kotlin stdlib to test's classpath.
This commit is contained in:
Ivan Kylchik
2021-11-15 17:30:42 +03:00
committed by TeamCityServer
parent 960ba3ffde
commit c7435ba760
4318 changed files with 4328 additions and 4326 deletions
@@ -41,7 +41,7 @@ object GenerateInRangeExpressionTestData {
println("// IGNORE_BACKEND: WASM")
}
println("// $PREAMBLE_MESSAGE")
println("// WITH_RUNTIME")
println("// WITH_STDLIB")
println()
println(header)
println()
@@ -162,7 +162,7 @@ public class GenerateRangesCodegenTestData {
out.println("// IGNORE_BACKEND: JVM_IR");
}
out.println("// Auto-generated by " + GenerateRangesCodegenTestData.class.getName() + ". DO NOT EDIT!");
out.println("// WITH_RUNTIME");
out.println("// WITH_STDLIB");
if (useOldManglingScheme) {
out.println("// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME");
}
@@ -177,7 +177,7 @@ object GenerateSteppedRangesCodegenTestData {
if (shouldIgnoreForJvmIR) {
println("// IGNORE_BACKEND: JVM_IR")
}
println("// WITH_RUNTIME")
println("// WITH_STDLIB")
if (asLiteral && KT_34166_AFFECTED_FILENAMES.contains(fileName)) {
println(KT_34166_HEADER)
}
@@ -43,10 +43,9 @@ abstract class AbstractMultiPlatformIntegrationTest : KtUsefulTestCase() {
val tmpdir = KtTestUtil.tmpDir(getTestName(true))
val optionalStdlibCommon =
if (InTextDirectivesUtils.isDirectiveDefined(commonSrc.readText(), "WITH_RUNTIME"))
arrayOf("-cp", findStdlibCommon().absolutePath)
else emptyArray()
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 commonDest = File(tmpdir, "common").absolutePath
val jvmDest = File(tmpdir, "jvm").absolutePath.takeIf { jvmSrc != null }