From d76cb32781ce256c17370ecec55aef2b2e486b6e Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Fri, 21 Dec 2018 12:12:45 +0100 Subject: [PATCH] Specify JVM target backend for test with java type inheritance --- compiler/testData/codegen/box/casts/functions/asFunKSmall.kt | 4 +--- .../codegen/box/casts/functions/reifiedAsFunKSmall.kt | 4 +--- .../codegen/box/casts/mutableCollections/weirdMutableCasts.kt | 4 +--- compiler/testData/codegen/box/classes/kt1134.kt | 3 +-- compiler/testData/codegen/box/classes/kt2288.kt | 3 +-- .../forInIterableWithIndex/forInListWithIndexThrowsCME.kt | 3 +-- .../forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt | 3 +-- compiler/testData/codegen/box/controlStructures/kt8148.kt | 4 +--- .../testData/codegen/box/controlStructures/kt8148_break.kt | 4 +--- .../testData/codegen/box/controlStructures/kt8148_continue.kt | 4 +--- .../codegen/box/fullJdk/native/nativePropertyAccessors.kt | 4 +--- compiler/testData/codegen/box/fullJdk/native/simpleNative.kt | 4 +--- compiler/testData/codegen/box/fullJdk/native/topLevel.kt | 4 +--- .../testData/codegen/box/specialBuiltins/collectionImpl.kt | 4 +--- 14 files changed, 14 insertions(+), 38 deletions(-) diff --git a/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt index 3b05fed1f75..63c491a252b 100644 --- a/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt +++ b/compiler/testData/codegen/box/casts/functions/asFunKSmall.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND: JS_IR -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM fun fn0() {} fun fn1(x: Any) {} diff --git a/compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt b/compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt index be076d05d8b..15852ce35b5 100644 --- a/compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt +++ b/compiler/testData/codegen/box/casts/functions/reifiedAsFunKSmall.kt @@ -1,7 +1,5 @@ // IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND: JS_IR -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM fun fn0() {} fun fn1(x: Any) {} diff --git a/compiler/testData/codegen/box/casts/mutableCollections/weirdMutableCasts.kt b/compiler/testData/codegen/box/casts/mutableCollections/weirdMutableCasts.kt index d64dea2f9f0..7d6f8448699 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/weirdMutableCasts.kt +++ b/compiler/testData/codegen/box/casts/mutableCollections/weirdMutableCasts.kt @@ -1,7 +1,5 @@ // IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND: JS_IR -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/classes/kt1134.kt b/compiler/testData/codegen/box/classes/kt1134.kt index 2bfc5fbf6f7..9022b6c5a8e 100644 --- a/compiler/testData/codegen/box/classes/kt1134.kt +++ b/compiler/testData/codegen/box/classes/kt1134.kt @@ -1,6 +1,5 @@ -// IGNORE_BACKEND: JS_IR // TODO: Enable when JS backend supports Java class library -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM public class SomeClass() : java.lang.Object() { } diff --git a/compiler/testData/codegen/box/classes/kt2288.kt b/compiler/testData/codegen/box/classes/kt2288.kt index 7447e0df09d..7ec131fb835 100644 --- a/compiler/testData/codegen/box/classes/kt2288.kt +++ b/compiler/testData/codegen/box/classes/kt2288.kt @@ -1,6 +1,5 @@ -// IGNORE_BACKEND: JS_IR // TODO: Enable when JS backend supports Java class library -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM public open class Test(): java.util.RandomAccess, Cloneable, java.io.Serializable { public override fun clone(): Test = Test() // Override 'clone()' with more precise type 'Test' diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexThrowsCME.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexThrowsCME.kt index e46530b434f..d4b871338bc 100644 --- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexThrowsCME.kt +++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexThrowsCME.kt @@ -1,6 +1,5 @@ // IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM // FULL_JDK // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt index ea052e2f8f2..da6c206e2fd 100644 --- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt +++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt @@ -1,6 +1,5 @@ // IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM // FULL_JDK // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/controlStructures/kt8148.kt b/compiler/testData/codegen/box/controlStructures/kt8148.kt index fff5d8240bc..a5de63158bf 100644 --- a/compiler/testData/codegen/box/controlStructures/kt8148.kt +++ b/compiler/testData/codegen/box/controlStructures/kt8148.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND: JS_IR -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM class A(var value: String) diff --git a/compiler/testData/codegen/box/controlStructures/kt8148_break.kt b/compiler/testData/codegen/box/controlStructures/kt8148_break.kt index 46828ee3777..d86cc0f65b4 100644 --- a/compiler/testData/codegen/box/controlStructures/kt8148_break.kt +++ b/compiler/testData/codegen/box/controlStructures/kt8148_break.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND: JS_IR -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM class A(var value: String) diff --git a/compiler/testData/codegen/box/controlStructures/kt8148_continue.kt b/compiler/testData/codegen/box/controlStructures/kt8148_continue.kt index 0e1e629ed5a..78ae24ddb4e 100644 --- a/compiler/testData/codegen/box/controlStructures/kt8148_continue.kt +++ b/compiler/testData/codegen/box/controlStructures/kt8148_continue.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND: JS_IR -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM class A(var value: String) diff --git a/compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt b/compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt index e2f74aa5afb..44d31041f0c 100644 --- a/compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt +++ b/compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND: JS_IR -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM // FULL_JDK diff --git a/compiler/testData/codegen/box/fullJdk/native/simpleNative.kt b/compiler/testData/codegen/box/fullJdk/native/simpleNative.kt index d144f7f3c08..3675e1fa6d6 100644 --- a/compiler/testData/codegen/box/fullJdk/native/simpleNative.kt +++ b/compiler/testData/codegen/box/fullJdk/native/simpleNative.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND: JS_IR -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM // FULL_JDK diff --git a/compiler/testData/codegen/box/fullJdk/native/topLevel.kt b/compiler/testData/codegen/box/fullJdk/native/topLevel.kt index a471a84af2e..ef215d03b29 100644 --- a/compiler/testData/codegen/box/fullJdk/native/topLevel.kt +++ b/compiler/testData/codegen/box/fullJdk/native/topLevel.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND: JS_IR -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM // FULL_JDK diff --git a/compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt b/compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt index af056b785c5..0566ea1c8c1 100644 --- a/compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt +++ b/compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND: JS_IR -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM class A1 : MutableCollection { override val size: Int