From 8ec49adcf06168626e2e0166cc56f4e5e67ff405 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Tue, 11 Sep 2018 17:48:53 +0300 Subject: [PATCH] Minor. Ignore test --- .idea/encodings.xml | 3 ++- .../destructuringInSuspendLambda/otherParameters.kt | 2 ++ .../codegen/CheckLocalVariablesTableTestGenerated.java | 8 ++++---- .../kotlin/generators/tests/GenerateCompilerTests.kt | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.idea/encodings.xml b/.idea/encodings.xml index ae1d81c10d9..d6b98908c96 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,6 @@ - + @@ -14,6 +14,7 @@ + diff --git a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/otherParameters.kt b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/otherParameters.kt index 6caff11bed5..1d525ec9626 100644 --- a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/otherParameters.kt +++ b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/otherParameters.kt @@ -1,4 +1,6 @@ // IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND: JVM +// WITH_RUNTIME data class A(val x: String, val y: String) suspend fun foo(a: A, block: suspend (Int, A, String) -> String): String = block(1, a, "#") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java index 18606ef6a96..96cbcfe116a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java @@ -22,11 +22,11 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVariablesTableTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } public void testAllFilesPresentInCheckLocalVariablesTable() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/checkLocalVariablesTable"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/checkLocalVariablesTable"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true); } @TestMetadata("catchClause.kt") @@ -114,11 +114,11 @@ public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVar @RunWith(JUnit3RunnerWithInners.class) public static class DestructuringInSuspendLambda extends AbstractCheckLocalVariablesTableTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } public void testAllFilesPresentInDestructuringInSuspendLambda() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true); } @TestMetadata("dataClass.kt") diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt index 6fbd044bf77..00a5ac1050b 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt @@ -201,7 +201,7 @@ fun main(args: Array) { } testClass { - model("checkLocalVariablesTable") + model("checkLocalVariablesTable", targetBackend = TargetBackend.JVM) } testClass {