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

Tests: keep "// !" directives first when auto-muting box tests

Browse Source
This commit is contained in:
Anton Bannykh
2018-06-06 18:59:23 +03:00
parent 1e169b0838
commit 7e1713af44
4 changed files with 76 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+19 -2
View File
@@ -1060,8 +1060,25 @@ public class KotlinTestUtils {
if (!isIgnored && AUTOMATICALLY_MUTE_FAILED_TESTS) {
String text = doLoadFile(testDataFile);
String directive = InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX + targetBackend.name();
String newText = directive + "\n" + text;
String directive = InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX + targetBackend.name() + "\n";
String newText;
if (text.startsWith("// !")) {
StringBuilder prefixBuilder = new StringBuilder();
int l = 0;
while (text.startsWith("// !", l)) {
int r = text.indexOf("\n", l) + 1;
if (r <= 0) r = text.length();
prefixBuilder.append(text.substring(l, r));
l = r;
}
prefixBuilder.append(directive);
prefixBuilder.append(text.substring(l));
newText = prefixBuilder.toString();
} else {
newText = directive + text;
}
if (!newText.equals(text)) {
System.err.println("\"" + directive + "\" was added to \"" + testDataFile + "\"");
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173
+19 -2
View File
@@ -1060,8 +1060,25 @@ public class KotlinTestUtils {
if (!isIgnored && AUTOMATICALLY_MUTE_FAILED_TESTS) {
String text = doLoadFile(testDataFile);
String directive = InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX + targetBackend.name();
String newText = directive + "\n" + text;
String directive = InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX + targetBackend.name() + "\n";
String newText;
if (text.startsWith("// !")) {
StringBuilder prefixBuilder = new StringBuilder();
int l = 0;
while (text.startsWith("// !", l)) {
int r = text.indexOf("\n", l) + 1;
if (r <= 0) r = text.length();
prefixBuilder.append(text.substring(l, r));
l = r;
}
prefixBuilder.append(directive);
prefixBuilder.append(text.substring(l));
newText = prefixBuilder.toString();
} else {
newText = directive + text;
}
if (!newText.equals(text)) {
System.err.println("\"" + directive + "\" was added to \"" + testDataFile + "\"");
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
+19 -2
View File
@@ -1060,8 +1060,25 @@ public class KotlinTestUtils {
if (!isIgnored && AUTOMATICALLY_MUTE_FAILED_TESTS) {
String text = doLoadFile(testDataFile);
String directive = InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX + targetBackend.name();
String newText = directive + "\n" + text;
String directive = InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX + targetBackend.name() + "\n";
String newText;
if (text.startsWith("// !")) {
StringBuilder prefixBuilder = new StringBuilder();
int l = 0;
while (text.startsWith("// !", l)) {
int r = text.indexOf("\n", l) + 1;
if (r <= 0) r = text.length();
prefixBuilder.append(text.substring(l, r));
l = r;
}
prefixBuilder.append(directive);
prefixBuilder.append(text.substring(l));
newText = prefixBuilder.toString();
} else {
newText = directive + text;
}
if (!newText.equals(text)) {
System.err.println("\"" + directive + "\" was added to \"" + testDataFile + "\"");
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
+19 -2
View File
@@ -1060,8 +1060,25 @@ public class KotlinTestUtils {
if (!isIgnored && AUTOMATICALLY_MUTE_FAILED_TESTS) {
String text = doLoadFile(testDataFile);
String directive = InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX + targetBackend.name();
String newText = directive + "\n" + text;
String directive = InTextDirectivesUtils.IGNORE_BACKEND_DIRECTIVE_PREFIX + targetBackend.name() + "\n";
String newText;
if (text.startsWith("// !")) {
StringBuilder prefixBuilder = new StringBuilder();
int l = 0;
while (text.startsWith("// !", l)) {
int r = text.indexOf("\n", l) + 1;
if (r <= 0) r = text.length();
prefixBuilder.append(text.substring(l, r));
l = r;
}
prefixBuilder.append(directive);
prefixBuilder.append(text.substring(l));
newText = prefixBuilder.toString();
} else {
newText = directive + text;
}
if (!newText.equals(text)) {
System.err.println("\"" + directive + "\" was added to \"" + testDataFile + "\"");