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

Test infra: refactor IGNORE_BACKEND directive

Browse Source 
treat it as a general one, introduce *_K1 and *_K2 variants for
more specific ignoring
This commit is contained in:
Ilya Chernikov
2022-07-21 16:39:12 +02:00
parent 8f18ab19f7
commit 5b3816cce5
234 changed files with 432 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+2 -2
View File
@@ -659,7 +659,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
}
}
protected String getIgnoreBackendDirectivePrefix() {
return InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX;
protected String[] getIgnoreBackendDirectivePrefix() {
return InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIXES;
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+19 -14
View File
@@ -63,7 +63,7 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static org.jetbrains.kotlin.test.InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX;
import static org.jetbrains.kotlin.test.InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIXES;
import static org.jetbrains.kotlin.test.InTextDirectivesUtils.isIgnoredTarget;
public class KotlinTestUtils {
@@ -431,7 +431,7 @@ public class KotlinTestUtils {
}
public static void runTest(@NotNull DoTest test, @NotNull TestCase testCase, @TestDataFile String testDataFile) throws Exception {
runTestImpl(testWithCustomIgnoreDirective(test, TargetBackend.ANY, IGNORE_BACKEND_DIRECTIVE_PREFIX), testCase, testDataFile);
runTestImpl(testWithCustomIgnoreDirective(test, TargetBackend.ANY, IGNORE_BACKEND_DIRECTIVE_PREFIXES), testCase, testDataFile);
}
public static void runTest(@NotNull TestCase testCase, @NotNull Function0<Unit> test) {
@@ -469,7 +469,7 @@ public class KotlinTestUtils {
// * sometimes, for too common/general names, it shows many variants to navigate
// * it adds an additional step for navigation -- you must choose an exact file to navigate
public static void runTest0(DoTest test, TargetBackend targetBackend, String testDataFilePath) throws Exception {
runTestImpl(testWithCustomIgnoreDirective(test, targetBackend, IGNORE_BACKEND_DIRECTIVE_PREFIX), null, testDataFilePath);
runTestImpl(testWithCustomIgnoreDirective(test, targetBackend, IGNORE_BACKEND_DIRECTIVE_PREFIXES), null, testDataFilePath);
}
private static void runTestImpl(@NotNull DoTest test, @Nullable TestCase testCase, String testDataFilePath) throws Exception {
@@ -504,11 +504,11 @@ public class KotlinTestUtils {
return false;
}
private static DoTest testWithCustomIgnoreDirective(DoTest test, TargetBackend targetBackend, String ignoreDirective) throws Exception {
private static DoTest testWithCustomIgnoreDirective(DoTest test, TargetBackend targetBackend, String... ignoreDirectives) throws Exception {
return filePath -> {
File testDataFile = new File(filePath);
boolean isIgnored = isIgnoredTarget(targetBackend, testDataFile, ignoreDirective);
boolean isIgnored = isIgnoredTarget(targetBackend, testDataFile, ignoreDirectives);
if (DONT_IGNORE_TESTS_WORKING_ON_COMPATIBLE_BACKEND) {
// Only ignore if it is ignored for both backends
@@ -523,7 +523,7 @@ public class KotlinTestUtils {
catch (Throwable e) {
if (!isIgnored && AUTOMATICALLY_MUTE_FAILED_TESTS) {
String text = KtTestUtil.doLoadFile(testDataFile);
String directive = ignoreDirective + targetBackend.name() + "\n";
String directive = ignoreDirectives[0] + targetBackend.name() + "\n";
String newText;
if (text.startsWith("// !")) {
@@ -556,23 +556,28 @@ public class KotlinTestUtils {
if (PRINT_STACKTRACE_FOR_IGNORED_TESTS) {
e.printStackTrace();
} else {
System.err.println("MUTED TEST with `" + ignoreDirective + "`");
System.err.println("MUTED TEST with `" + ignoreDirectives[0] + "`");
}
return;
}
if (isIgnored) {
StringBuilder directivesToRemove = new StringBuilder();
if (AUTOMATICALLY_UNMUTE_PASSED_TESTS) {
String text = KtTestUtil.doLoadFile(testDataFile);
String directive = ignoreDirective + targetBackend.name();
String newText = Pattern.compile("^" + directive + "\n", Pattern.MULTILINE).matcher(text).replaceAll("");
if (!newText.equals(text)) {
System.err.println("\"" + directive + "\" was removed from \"" + testDataFile + "\"");
FileUtil.writeToFile(testDataFile, newText);
for (String ignoreDirective: ignoreDirectives){
String text = KtTestUtil.doLoadFile(testDataFile);
String directive = ignoreDirective + targetBackend.name();
directivesToRemove.append(directive);
directivesToRemove.append(", ");
String newText = Pattern.compile("^" + directive + "\n", Pattern.MULTILINE).matcher(text).replaceAll("");
if (!newText.equals(text)) {
System.err.println("\"" + directive + "\" was removed from \"" + testDataFile + "\"");
FileUtil.writeToFile(testDataFile, newText);
}
}
}
throw new AssertionError(String.format("Looks like this test can be unmuted. Remove \"%s%s\" directive.", ignoreDirective, targetBackend));
throw new AssertionError(String.format("Looks like this test can be unmuted. Remove \"%s\" directive.", directivesToRemove.toString()));
}
};
}