From 7f012fabc21fa3159fb0bea71043aa812242a2fe Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Wed, 17 May 2017 18:33:40 +0300 Subject: [PATCH] Ignored/enabled/fixed some external tests --- .../tests/external/codegen/box/arrays/arraysAreCloneable.kt | 2 +- backend.native/tests/external/codegen/box/arrays/cloneArray.kt | 2 +- .../tests/external/codegen/box/arrays/clonePrimitiveArrays.kt | 2 +- .../tailCallOptimizations/inlineWithoutStateMachine.kt | 1 - .../codegen/box/coroutines/tailCallOptimizations/simple.kt | 1 - .../codegen/box/when/stringOptimization/sameHashCode.kt | 2 +- .../boxInline/argumentOrder/varargAndDefaultParameters.kt | 3 +-- .../boxInline/defaultValues/lambdaInlining/jvmStaticDefault.kt | 1 + .../external/codegen/boxInline/reified/capturedLambda2.kt | 1 - .../tests/external/codegen/boxInline/reified/kt15997.kt | 1 + .../tests/external/codegen/boxInline/reified/kt15997_2.kt | 1 + .../tests/external/codegen/boxInline/reified/kt9637_2.kt | 1 + 12 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend.native/tests/external/codegen/box/arrays/arraysAreCloneable.kt b/backend.native/tests/external/codegen/box/arrays/arraysAreCloneable.kt index 52075d459d7..f0860dadc0a 100644 --- a/backend.native/tests/external/codegen/box/arrays/arraysAreCloneable.kt +++ b/backend.native/tests/external/codegen/box/arrays/arraysAreCloneable.kt @@ -1,5 +1,5 @@ // TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS +// IGNORE_BACKEND: JS, NATIVE fun foo(x: Cloneable) = x diff --git a/backend.native/tests/external/codegen/box/arrays/cloneArray.kt b/backend.native/tests/external/codegen/box/arrays/cloneArray.kt index 8e29271c7d7..fe7ae5ff309 100644 --- a/backend.native/tests/external/codegen/box/arrays/cloneArray.kt +++ b/backend.native/tests/external/codegen/box/arrays/cloneArray.kt @@ -1,5 +1,5 @@ // TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS +// IGNORE_BACKEND: JS, NATIVE // WITH_RUNTIME diff --git a/backend.native/tests/external/codegen/box/arrays/clonePrimitiveArrays.kt b/backend.native/tests/external/codegen/box/arrays/clonePrimitiveArrays.kt index dc6646587d6..578c79c0d3c 100644 --- a/backend.native/tests/external/codegen/box/arrays/clonePrimitiveArrays.kt +++ b/backend.native/tests/external/codegen/box/arrays/clonePrimitiveArrays.kt @@ -1,5 +1,5 @@ // TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS +// IGNORE_BACKEND: JS, NATIVE // WITH_RUNTIME diff --git a/backend.native/tests/external/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt b/backend.native/tests/external/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt index 845db0b8be0..20416637b3d 100644 --- a/backend.native/tests/external/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt +++ b/backend.native/tests/external/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: NATIVE // WITH_RUNTIME // WITH_COROUTINES import helpers.* diff --git a/backend.native/tests/external/codegen/box/coroutines/tailCallOptimizations/simple.kt b/backend.native/tests/external/codegen/box/coroutines/tailCallOptimizations/simple.kt index 85f0f44f878..353f5f3f5a4 100644 --- a/backend.native/tests/external/codegen/box/coroutines/tailCallOptimizations/simple.kt +++ b/backend.native/tests/external/codegen/box/coroutines/tailCallOptimizations/simple.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: NATIVE // WITH_RUNTIME // WITH_COROUTINES // CHECK_BYTECODE_LISTING diff --git a/backend.native/tests/external/codegen/box/when/stringOptimization/sameHashCode.kt b/backend.native/tests/external/codegen/box/when/stringOptimization/sameHashCode.kt index 2114ac50d26..fd4d11e6b65 100644 --- a/backend.native/tests/external/codegen/box/when/stringOptimization/sameHashCode.kt +++ b/backend.native/tests/external/codegen/box/when/stringOptimization/sameHashCode.kt @@ -1,5 +1,5 @@ // TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS +// IGNORE_BACKEND: JS, NATIVE // WITH_RUNTIME diff --git a/backend.native/tests/external/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt b/backend.native/tests/external/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt index 6bff7d61719..e50b5bb04d6 100644 --- a/backend.native/tests/external/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt +++ b/backend.native/tests/external/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt @@ -29,8 +29,7 @@ fun box(): String { init = { invokeOrder += " init"; "I" }()) if (result != "C, R, I") return "fail 1: $result" - //Change test after KT-17691 FIX - if (invokeOrder != " receiver initconstraints") return "fail 2: $invokeOrder" + if (invokeOrder != "constraints receiver init") return "fail 2: $invokeOrder" result = "" invokeOrder = "" diff --git a/backend.native/tests/external/codegen/boxInline/defaultValues/lambdaInlining/jvmStaticDefault.kt b/backend.native/tests/external/codegen/boxInline/defaultValues/lambdaInlining/jvmStaticDefault.kt index 0c9f8c16e1d..7d80244b3fe 100644 --- a/backend.native/tests/external/codegen/boxInline/defaultValues/lambdaInlining/jvmStaticDefault.kt +++ b/backend.native/tests/external/codegen/boxInline/defaultValues/lambdaInlining/jvmStaticDefault.kt @@ -1,5 +1,6 @@ // FILE: 1.kt // SKIP_INLINE_CHECK_IN: inlineFun$default +// IGNORE_BACKEND: NATIVE //WITH_RUNTIME package test diff --git a/backend.native/tests/external/codegen/boxInline/reified/capturedLambda2.kt b/backend.native/tests/external/codegen/boxInline/reified/capturedLambda2.kt index f25f1ec8d22..dcc09a82265 100644 --- a/backend.native/tests/external/codegen/boxInline/reified/capturedLambda2.kt +++ b/backend.native/tests/external/codegen/boxInline/reified/capturedLambda2.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: NATIVE // FILE: 1.kt // WITH_REFLECT package test diff --git a/backend.native/tests/external/codegen/boxInline/reified/kt15997.kt b/backend.native/tests/external/codegen/boxInline/reified/kt15997.kt index ec3b3ce6ec6..1dab7b85236 100644 --- a/backend.native/tests/external/codegen/boxInline/reified/kt15997.kt +++ b/backend.native/tests/external/codegen/boxInline/reified/kt15997.kt @@ -1,6 +1,7 @@ // FILE: 1.kt // FULL_JDK // WITH_REFLECT +// IGNORE_BACKEND: NATIVE package test import kotlin.properties.Delegates diff --git a/backend.native/tests/external/codegen/boxInline/reified/kt15997_2.kt b/backend.native/tests/external/codegen/boxInline/reified/kt15997_2.kt index e953b847f29..04301fc681c 100644 --- a/backend.native/tests/external/codegen/boxInline/reified/kt15997_2.kt +++ b/backend.native/tests/external/codegen/boxInline/reified/kt15997_2.kt @@ -1,6 +1,7 @@ // FILE: 1.kt // FULL_JDK // WITH_REFLECT +// IGNORE_BACKEND: NATIVE package test import kotlin.properties.Delegates diff --git a/backend.native/tests/external/codegen/boxInline/reified/kt9637_2.kt b/backend.native/tests/external/codegen/boxInline/reified/kt9637_2.kt index c73c2638623..bd2c993cb0c 100644 --- a/backend.native/tests/external/codegen/boxInline/reified/kt9637_2.kt +++ b/backend.native/tests/external/codegen/boxInline/reified/kt9637_2.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND: NATIVE // FILE: 1.kt package test