azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable generation of 1.2 coroutine tests for JS_IR

Browse Source 
Add directive DONT_TARGET_EXACT_BACKEND.
This directive is needed to exclude JS_IR backned but keep "compatible"
JS backend.
This commit is contained in:
Svyatoslav Kuzmich
2019-01-27 02:47:42 +03:00
parent ab3eb06a62
commit b49ec3edb8
10 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_2.kt
Vendored
+2 -1
View File
@@ -1,7 +1,8 @@
// !LANGUAGE: -ReleaseCoroutines -ExperimentalBuilderInference
// IGNORE_BACKEND: JVM_IR, JS_IR
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// WITH_COROUTINES
// DONT_TARGET_EXACT_BACKEND: JS_IR
import helpers.*
import kotlin.coroutines.experimental.*
compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_2.kt
Vendored
+2 -1
View File
@@ -1,7 +1,8 @@
// !LANGUAGE: -ReleaseCoroutines -ExperimentalBuilderInference
// IGNORE_BACKEND: JVM_IR, JS_IR
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// WITH_COROUTINES
// DONT_TARGET_EXACT_BACKEND: JS_IR
import helpers.*
import kotlin.coroutines.experimental.*
compiler/testData/codegen/box/coroutines/asyncIterator_1_2.kt
Vendored
+2 -1
View File
@@ -1,7 +1,8 @@
// !LANGUAGE: -ReleaseCoroutines -ExperimentalBuilderInference
// IGNORE_BACKEND: JVM_IR, JS_IR
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// WITH_COROUTINES
// DONT_TARGET_EXACT_BACKEND: JS_IR
import helpers.*
import kotlin.coroutines.experimental.*
compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_2.kt
Vendored
+1 -1
View File
@@ -1,8 +1,8 @@
// !LANGUAGE: -ReleaseCoroutines
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// WITH_COROUTINES
// DONT_TARGET_EXACT_BACKEND: JS_IR
import helpers.*
import kotlin.coroutines.experimental.*
compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances_1_2.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// !LANGUAGE: -ReleaseCoroutines
// IGNORE_BACKEND: JS_IR
// WITH_RUNTIME
// WITH_COROUTINES
// DONT_TARGET_EXACT_BACKEND: JS_IR
// IGNORE_BACKEND: JS
import kotlin.coroutines.experimental.*
compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt
Vendored
+1 -1
View File
@@ -1,9 +1,9 @@
// !LANGUAGE: -ReleaseCoroutines
// WITH_COROUTINES
// WITH_REFLECT
// DONT_TARGET_EXACT_BACKEND: JS_IR
// IGNORE_BACKEND: NATIVE
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS
import helpers.*
compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_2.kt
Vendored
+1 -1
View File
@@ -1,8 +1,8 @@
// !LANGUAGE: -ReleaseCoroutines
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
// WITH_COROUTINES
// DONT_TARGET_EXACT_BACKEND: JS_IR
import helpers.*
import kotlin.coroutines.experimental.*
compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt
Vendored
+1
View File
@@ -4,6 +4,7 @@
// WITH_RUNTIME
// WITH_COROUTINES
// COMMON_COROUTINES_TEST
// KJS_WITH_FULL_RUNTIME
import helpers.*
import COROUTINES_PACKAGE.*
import COROUTINES_PACKAGE.intrinsics.*
compiler/tests-common/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java
+4
View File
@@ -221,6 +221,10 @@ public final class InTextDirectivesUtils {
public static boolean isCompatibleTarget(TargetBackend targetBackend, File file) {
if (targetBackend == TargetBackend.ANY) return true;
List<String> doNotTarget = findLinesWithPrefixesRemoved(textWithDirectives(file), "// DONT_TARGET_EXACT_BACKEND: ");
if (doNotTarget.contains(targetBackend.name()))
return false;
List<String> backends = findLinesWithPrefixesRemoved(textWithDirectives(file), "// TARGET_BACKEND: ");
return backends.isEmpty() || backends.contains(targetBackend.name()) || backends.contains(targetBackend.getCompatibleWith().name());
}
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrJsCodegenBoxTestGenerated.java
Generated
-35
View File
@@ -4669,31 +4669,16 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS_IR, true);
}
@TestMetadata("asyncIteratorNullMerge_1_2.kt")
public void testAsyncIteratorNullMerge_1_2() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_2.kt");
}
@TestMetadata("asyncIteratorNullMerge_1_3.kt")
public void testAsyncIteratorNullMerge_1_3() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_3.kt");
}
@TestMetadata("asyncIteratorToList_1_2.kt")
public void testAsyncIteratorToList_1_2() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_2.kt");
}
@TestMetadata("asyncIteratorToList_1_3.kt")
public void testAsyncIteratorToList_1_3() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_3.kt");
}
@TestMetadata("asyncIterator_1_2.kt")
public void testAsyncIterator_1_2() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/asyncIterator_1_2.kt");
}
@TestMetadata("asyncIterator_1_3.kt")
public void testAsyncIterator_1_3() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt");
@@ -4749,11 +4734,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt");
}
@TestMetadata("createCoroutinesOnManualInstances_1_2.kt")
public void testCreateCoroutinesOnManualInstances_1_2() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances_1_2.kt");
}
@TestMetadata("crossInlineWithCapturedOuterReceiver.kt")
public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt", "kotlin.coroutines");
@@ -5192,11 +5172,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt", "kotlin.coroutines");
}
@TestMetadata("kt22694_1_2.kt")
public void testKt22694_1_2() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_2.kt");
}
@TestMetadata("kt22694_1_3.kt")
public void testKt22694_1_3() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_3.kt");
@@ -5873,11 +5848,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
public void testAllFilesPresentInReflect() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines/reflect"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS_IR, true);
}
@TestMetadata("isSuspend12.kt")
public void testIsSuspend12() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding")
@@ -5953,11 +5923,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt", "kotlin.coroutines");
}
@TestMetadata("ifExpressionInsideCoroutine_1_2.kt")
public void testIfExpressionInsideCoroutine_1_2() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_2.kt");
}
@TestMetadata("ifExpressionInsideCoroutine_1_3.kt")
public void testIfExpressionInsideCoroutine_1_3() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt");