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

[Test] Revert not-needed change in KotlinTestUtils

Browse Source 
The corresponding test was incorrectly muted in c818ce92
This commit is contained in:
Dmitriy Novozhilov
2024-03-13 16:23:04 +02:00
committed by Space Team
parent a8275c99a3
commit 09c27d78b8
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/klib/kt33411.kt
Vendored
+1 -2
View File
@@ -1,8 +1,7 @@
// IGNORE_NATIVE: cacheMode=STATIC_EVERYWHERE && target=linux_x64 // IGNORE_NATIVE: cacheMode=STATIC_EVERYWHERE && target=linux_x64
// IGNORE_NATIVE: cacheMode=STATIC_PER_FILE_EVERYWHERE && target=linux_x64 // IGNORE_NATIVE: cacheMode=STATIC_PER_FILE_EVERYWHERE && target=linux_x64
// IGNORE_BACKEND_K1: JVM, JVM_IR // IGNORE_BACKEND_K1: JVM, JVM_IR
// DONT_CHECK_IGNORED // IGNORE_LIGHT_ANALYSIS
// LightAnalysisModeTestGenerated passes because it doesn't compile the body of function `box` actually
// ISSUE: KT-33411, KT-66338 // ISSUE: KT-33411, KT-66338
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+3 -11
View File
@@ -63,7 +63,8 @@ import java.util.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static org.jetbrains.kotlin.test.InTextDirectivesUtils.*; import static org.jetbrains.kotlin.test.InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIXES;
import static org.jetbrains.kotlin.test.InTextDirectivesUtils.isIgnoredTarget;
public class KotlinTestUtils { public class KotlinTestUtils {
public static String TEST_MODULE_NAME = "test-module"; public static String TEST_MODULE_NAME = "test-module";
@@ -82,13 +83,6 @@ public class KotlinTestUtils {
private static final Pattern DIRECTIVE_PATTERN = Pattern.compile("^//\\s*[!]?([A-Z_0-9]+)(:[ \\t]*(.*))?$", Pattern.MULTILINE); private static final Pattern DIRECTIVE_PATTERN = Pattern.compile("^//\\s*[!]?([A-Z_0-9]+)(:[ \\t]*(.*))?$", Pattern.MULTILINE);
/**
* This directive removes checks if ignored test actually passes or not
* It is very hacky and supposed to be use only in cases when some test passes in one configuration and fails in the other,
* and both those configurations share the same ignore directive
*/
private static final String DONT_CHECK_IGNORED = "DONT_CHECK_IGNORED";
private KotlinTestUtils() { private KotlinTestUtils() {
} }
@@ -577,9 +571,7 @@ public class KotlinTestUtils {
return; return;
} }
boolean dontCheckIgnored = InTextDirectivesUtils.isDirectiveDefined(textWithDirectives(testDataFile), DONT_CHECK_IGNORED); if (isIgnored) {
if (isIgnored && !dontCheckIgnored) {
StringBuilder directivesToRemove = new StringBuilder(); StringBuilder directivesToRemove = new StringBuilder();
if (AUTOMATICALLY_UNMUTE_PASSED_TESTS) { if (AUTOMATICALLY_UNMUTE_PASSED_TESTS) {
for (String ignoreDirective: ignoreDirectives){ for (String ignoreDirective: ignoreDirectives){