diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java index 1f31d526233..6129cfca44b 100644 --- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java @@ -245,8 +245,14 @@ public final class InTextDirectivesUtils { } public static boolean isIgnoredTarget(@NotNull TargetBackend targetBackend, @NotNull File file, String... ignoreBackendDirectivePrefixes) { + return isIgnoredTarget(targetBackend, file, false, ignoreBackendDirectivePrefixes); + } + + public static boolean isIgnoredTarget(@NotNull TargetBackend targetBackend, @NotNull File file, boolean includeAny, String... ignoreBackendDirectivePrefixes) { List ignoredBackends = findListWithPrefixes(textWithDirectives(file), ignoreBackendDirectivePrefixes); - return ignoredBackends.contains(targetBackend.name()); + if (ignoredBackends.contains(targetBackend.name())) return true; + if (includeAny && ignoredBackends.contains("ANY")) return true; + return false; } public static boolean isIgnoredTarget(@NotNull TargetBackend targetBackend, @NotNull File file) { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt index e6fb8f41aeb..de626fb4a6e 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt @@ -146,9 +146,21 @@ private class ExtTestDataFile( private fun isIgnoredNativeTarget(pipelineType: PipelineType, testDataFile: File): Boolean { return when (pipelineType) { PipelineType.K1 -> - isIgnoredTarget(TargetBackend.NATIVE, testDataFile, IGNORE_BACKEND_DIRECTIVE_PREFIX, IGNORE_BACKEND_K1_DIRECTIVE_PREFIX) + isIgnoredTarget( + TargetBackend.NATIVE, + testDataFile, + /*includeAny = */true, + IGNORE_BACKEND_DIRECTIVE_PREFIX, + IGNORE_BACKEND_K1_DIRECTIVE_PREFIX + ) PipelineType.K2 -> - isIgnoredTarget(TargetBackend.NATIVE, testDataFile, IGNORE_BACKEND_DIRECTIVE_PREFIX, IGNORE_BACKEND_K2_DIRECTIVE_PREFIX) + isIgnoredTarget( + TargetBackend.NATIVE, + testDataFile, + /*includeAny = */true, + IGNORE_BACKEND_DIRECTIVE_PREFIX, + IGNORE_BACKEND_K2_DIRECTIVE_PREFIX + ) } }