From 5ff15f6847a241c4511a4b519d9d19506df284c8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 21 Sep 2023 11:25:52 +0200 Subject: [PATCH] CLI tests: fix incorrect order of replacing versions The change 9de6df6104 caused tests `requireKotlinCompilerVersion{,K2}` to fail once the compiler version was changed to 2.0.0-dev-*. The reason is that when patch version is 0, compiler version is equal to the language version (which is itself always equal to JvmMetadataVersion). So if we're replacing JvmMetadataVersion first, we end up with `$ABI_VERSION$-dev-...` in the output, which is incorrect. --- .../tests/org/jetbrains/kotlin/cli/AbstractCliTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java index 32ad065b02f..c9042674bd6 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java @@ -102,11 +102,11 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir { .replace(org.jetbrains.kotlin.konan.file.File.Companion.getUserDir().getAbsolutePath(), "$USER_DIR$") .replace(tmpDirAbsoluteDir, "$TMP_DIR$") .replaceAll("info: executable production duration: \\d+ms", "info: executable production duration: [time]") + .replace(KotlinCompilerVersion.VERSION, "$VERSION$") .replace(" " + JvmMetadataVersion.INSTANCE, " $ABI_VERSION$") .replace(" " + JsMetadataVersion.INSTANCE, " $ABI_VERSION$") .replace(" " + JvmMetadataVersion.INSTANCE_NEXT, " $ABI_VERSION_NEXT$") .replace("\\", "/") - .replace(KotlinCompilerVersion.VERSION, "$VERSION$") .replace("\n" + Usage.BAT_DELIMITER_CHARACTERS_NOTE + "\n", "") .replaceAll("log4j:WARN.*\n", "");