From c777ecd470c7465cd7b6a3a49b78e584198d84f5 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 23 May 2022 10:30:38 +0300 Subject: [PATCH] [JS] Unmute tests due to fixed KT-52339 --- .../codegen/box/ranges/unsigned/expression/emptyRange.kt | 1 - .../codegen/box/ranges/unsigned/expression/oneElementRange.kt | 1 - .../codegen/box/ranges/unsigned/expression/simpleRange.kt | 1 - .../unsigned/expression/simpleRangeWithNonConstantEnds.kt | 1 - compiler/testData/codegen/box/toArray/kt3177-toTypedArray.kt | 2 -- .../kotlin/generators/tests/GenerateRangesCodegenTestData.java | 2 +- js/js.translator/testData/lineNumbers/coroutine.kt | 2 +- 7 files changed, 2 insertions(+), 8 deletions(-) diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/emptyRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/emptyRange.kt index 8471b965ef7..15c86a0059d 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/emptyRange.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/emptyRange.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_STDLIB diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementRange.kt index 6137fcc92e6..b5113713a83 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementRange.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/oneElementRange.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_STDLIB diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRange.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRange.kt index 1ed8427d847..115d24d4bac 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRange.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRange.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_STDLIB diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt index 01e7bcb9813..97efa9095f0 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_STDLIB diff --git a/compiler/testData/codegen/box/toArray/kt3177-toTypedArray.kt b/compiler/testData/codegen/box/toArray/kt3177-toTypedArray.kt index eb3520297cb..b2c7c35cd10 100644 --- a/compiler/testData/codegen/box/toArray/kt3177-toTypedArray.kt +++ b/compiler/testData/codegen/box/toArray/kt3177-toTypedArray.kt @@ -1,6 +1,4 @@ // WITH_STDLIB -// IGNORE_BACKEND: JS -// Ignore reason: changed line numbers after bootstrap update fun box(): String { val list = ArrayList>() diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java index 845833dc77b..ac3f7182a1f 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java @@ -78,7 +78,7 @@ public class GenerateRangesCodegenTestData { private static final List USE_OLD_MANGLING_IN_UNSIGNED_EXPRESSION_TESTS = Collections.emptyList(); - private static final List JS_FAILING_TESTS = Arrays.asList("simpleRange", "emptyRange", "oneElementRange", "simpleRangeWithNonConstantEnds"); + private static final List JS_FAILING_TESTS = Collections.emptyList(); static { for (String integerType : INTEGER_PRIMITIVES) { diff --git a/js/js.translator/testData/lineNumbers/coroutine.kt b/js/js.translator/testData/lineNumbers/coroutine.kt index 05528e4b652..8f663fd759a 100644 --- a/js/js.translator/testData/lineNumbers/coroutine.kt +++ b/js/js.translator/testData/lineNumbers/coroutine.kt @@ -14,5 +14,5 @@ suspend fun bar(): Unit { println(a + b) } -// LINES(JS): 72 4 4 4 7 5 5 75 75 5 75 5 5 6 4 4 4 9 15 9 9 9 * 9 15 10 10 11 11 11 11 11 * 11 12 12 13 13 13 13 13 13 13 14 14 * 9 15 9 9 9 9 +// LINES(JS): 39 4 4 4 7 5 5 45 45 5 93 45 5 5 6 4 4 4 9 15 9 9 9 * 9 15 10 10 11 11 11 11 11 * 11 12 12 13 13 13 13 13 13 13 14 14 * 9 15 9 9 9 9 // LINES(JS_IR): 19 19 * 50 50 93 93 3 45 3 45 45 6 6 19 * 9 9 9 9 9 9 9 9 * 9 9 * 10 10 * 11 * 11 12 12 * 13 * 13 13 14 14