From 235359e02859f32f92d631a179b9f2d9f0b38d93 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Tue, 20 Jul 2021 13:20:42 +0200 Subject: [PATCH] Ignore tests cause of KT-47542 #KT-47542 --- ...flictingOverloadsForThrowableInheritors.kt | 2 ++ ...lictingOverloadsForThrowableInheritors2.kt | 2 ++ .../LightAnalysisModeTestGenerated.java | 20 +++++++++---------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors.kt b/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors.kt index 3263d2d1eb8..5b0833a8866 100644 --- a/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors.kt +++ b/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors.kt @@ -1,4 +1,6 @@ // TARGET_BACKEND: JVM +// Ignored cause of KT-47542 +// IGNORE_BACKEND: JVM, JVM_IR // FULL_JDK // ISSUE: KT-45584 diff --git a/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors2.kt b/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors2.kt index 3263d2d1eb8..5b0833a8866 100644 --- a/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors2.kt +++ b/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors2.kt @@ -1,4 +1,6 @@ // TARGET_BACKEND: JVM +// Ignored cause of KT-47542 +// IGNORE_BACKEND: JVM, JVM_IR // FULL_JDK // ISSUE: KT-45584 diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index deaa4991b17..54fbe76e42b 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -18892,6 +18892,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class JavaInterop extends AbstractLightAnalysisModeTest { + @TestMetadata("conflictingOverloadsForThrowableInheritors.kt") + public void ignoreConflictingOverloadsForThrowableInheritors() throws Exception { + runTest("compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors.kt"); + } + + @TestMetadata("conflictingOverloadsForThrowableInheritors2.kt") + public void ignoreConflictingOverloadsForThrowableInheritors2() throws Exception { + runTest("compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors2.kt"); + } + private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } @@ -18905,16 +18915,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/javaInterop/ambiguousJavaVararg.kt"); } - @TestMetadata("conflictingOverloadsForThrowableInheritors.kt") - public void testConflictingOverloadsForThrowableInheritors() throws Exception { - runTest("compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors.kt"); - } - - @TestMetadata("conflictingOverloadsForThrowableInheritors2.kt") - public void testConflictingOverloadsForThrowableInheritors2() throws Exception { - runTest("compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors2.kt"); - } - @TestMetadata("genericSamProjectedOut.kt") public void testGenericSamProjectedOut() throws Exception { runTest("compiler/testData/codegen/box/javaInterop/genericSamProjectedOut.kt");