From f51a0048f666d0783236ae22be140a66eea30244 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 10 Dec 2019 18:18:14 +0300 Subject: [PATCH] Minor, rename test and avoid commented directive Get rid of "_lv12" in the test name, since it's actually a test on the modern compiler. Also, avoid the commented "IGNORE_BACKEND: JVM_IR" directive in another test to make JVM IR test failures more greppable. --- .../primitives/{equalsNull_lv12.kt => equalsNull.kt} | 0 .../platformTypes/primitives/equalsNull_withExplicitFlag.kt | 2 +- .../kotlin/codegen/BlackBoxCodegenTestGenerated.java | 6 +++--- .../kotlin/codegen/LightAnalysisModeTestGenerated.java | 6 +++--- .../kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java | 6 +++--- .../kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) rename compiler/testData/codegen/box/platformTypes/primitives/{equalsNull_lv12.kt => equalsNull.kt} (100%) diff --git a/compiler/testData/codegen/box/platformTypes/primitives/equalsNull_lv12.kt b/compiler/testData/codegen/box/platformTypes/primitives/equalsNull.kt similarity index 100% rename from compiler/testData/codegen/box/platformTypes/primitives/equalsNull_lv12.kt rename to compiler/testData/codegen/box/platformTypes/primitives/equalsNull.kt diff --git a/compiler/testData/codegen/box/platformTypes/primitives/equalsNull_withExplicitFlag.kt b/compiler/testData/codegen/box/platformTypes/primitives/equalsNull_withExplicitFlag.kt index 82754a4305d..536ceb5d142 100644 --- a/compiler/testData/codegen/box/platformTypes/primitives/equalsNull_withExplicitFlag.kt +++ b/compiler/testData/codegen/box/platformTypes/primitives/equalsNull_withExplicitFlag.kt @@ -4,7 +4,7 @@ // WITH_RUNTIME // FILE: equalsNull_withExplicitFlag.kt -// Should be: IGNORE_BACKEND: JVM_IR +// Should be ignored on JVM IR. // ^ TODO: fix intrinsic for 'equals' for boxed primitives // JVM_IR supports behavior since Kotlin 1.3, // and '-Xno-exception-on-explicit-equals-for-boxed-null' is a fallback flag introduced in 1.2. diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 5ef1a9ca1c5..3bdfa9f0713 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -18238,9 +18238,9 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/platformTypes/primitives/equals.kt"); } - @TestMetadata("equalsNull_lv12.kt") - public void testEqualsNull_lv12() throws Exception { - runTest("compiler/testData/codegen/box/platformTypes/primitives/equalsNull_lv12.kt"); + @TestMetadata("equalsNull.kt") + public void testEqualsNull() throws Exception { + runTest("compiler/testData/codegen/box/platformTypes/primitives/equalsNull.kt"); } @TestMetadata("equalsNull_withExplicitFlag.kt") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index c9c3aa3a088..1acd241c1a3 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -18238,9 +18238,9 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/platformTypes/primitives/equals.kt"); } - @TestMetadata("equalsNull_lv12.kt") - public void testEqualsNull_lv12() throws Exception { - runTest("compiler/testData/codegen/box/platformTypes/primitives/equalsNull_lv12.kt"); + @TestMetadata("equalsNull.kt") + public void testEqualsNull() throws Exception { + runTest("compiler/testData/codegen/box/platformTypes/primitives/equalsNull.kt"); } @TestMetadata("equalsNull_withExplicitFlag.kt") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java index f4cdd6dc47a..e56e863a624 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java @@ -16722,9 +16722,9 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/platformTypes/primitives/equals.kt"); } - @TestMetadata("equalsNull_lv12.kt") - public void testEqualsNull_lv12() throws Exception { - runTest("compiler/testData/codegen/box/platformTypes/primitives/equalsNull_lv12.kt"); + @TestMetadata("equalsNull.kt") + public void testEqualsNull() throws Exception { + runTest("compiler/testData/codegen/box/platformTypes/primitives/equalsNull.kt"); } @TestMetadata("equalsNull_withExplicitFlag.kt") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java index 689877ffa43..a57844230f7 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java @@ -16722,9 +16722,9 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/platformTypes/primitives/equals.kt"); } - @TestMetadata("equalsNull_lv12.kt") - public void testEqualsNull_lv12() throws Exception { - runTest("compiler/testData/codegen/box/platformTypes/primitives/equalsNull_lv12.kt"); + @TestMetadata("equalsNull.kt") + public void testEqualsNull() throws Exception { + runTest("compiler/testData/codegen/box/platformTypes/primitives/equalsNull.kt"); } @TestMetadata("equalsNull_withExplicitFlag.kt")