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

[Test] Ignore Native codegen test with IGNORE_BACKEND_...: ANY directive

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-02-03 11:12:34 +02:00
committed by Space Team
parent ae7718514b
commit a0bdecd22b
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java
+7 -1
View File
@@ -245,8 +245,14 @@ public final class InTextDirectivesUtils {
} }
public static boolean isIgnoredTarget(@NotNull TargetBackend targetBackend, @NotNull File file, String... ignoreBackendDirectivePrefixes) { 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<String> ignoredBackends = findListWithPrefixes(textWithDirectives(file), ignoreBackendDirectivePrefixes); List<String> 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) { public static boolean isIgnoredTarget(@NotNull TargetBackend targetBackend, @NotNull File file) {
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt
+14 -2
View File
@@ -146,9 +146,21 @@ private class ExtTestDataFile(
private fun isIgnoredNativeTarget(pipelineType: PipelineType, testDataFile: File): Boolean { private fun isIgnoredNativeTarget(pipelineType: PipelineType, testDataFile: File): Boolean {
return when (pipelineType) { return when (pipelineType) {
PipelineType.K1 -> 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 -> 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
)
} }
} }