Disable D8 checks for -jvm-target 15 tests

This commit is contained in:
Mikhael Bogdanov
2021-02-05 14:30:42 +01:00
parent 3dff225b98
commit 30b5bfe767
2 changed files with 9 additions and 2 deletions
@@ -20,12 +20,14 @@ import java.util.function.Consumer;
public class D8Checker {
public static final boolean RUN_D8_CHECKER = true;
public static final boolean RUN_D8_CHECKER = !Boolean.valueOf(System.getProperty("kotlin.test.box.d8.disable"));
private D8Checker() {
}
public static void check(ClassFileFactory outputFiles) {
if (!RUN_D8_CHECKER) return;
runD8(builder -> {
for (OutputFile file : ClassFileUtilsKt.getClassFiles(outputFiles)) {
byte[] bytes = file.asByteArray();
@@ -35,6 +37,7 @@ public class D8Checker {
}
public static void checkFilesWithD8(Collection<Pair<byte[], String>> classFiles) {
if (!RUN_D8_CHECKER) return;
runD8(builder -> {
classFiles.forEach(pair -> {
builder.addClassProgramData(pair.getFirst(), new PathOrigin(Paths.get(pair.getSecond())));
@@ -93,6 +93,7 @@ codegenTest(target = 8, jvm = 15) {
codegenTest(target = 15, jvm = 15) {
jvmArgs!!.add( "-XX:-FailOverToOldVerifier")
systemProperty("kotlin.test.box.d8.disable", true)
}
//..also add this two tasks to build after adding fresh jdks to build agents
@@ -112,6 +113,9 @@ codegenTest(
targetInTestClass = "Last",
jvm = "Last",
jdk = mostRecentJdk
) {}
) {
jvmArgs!!.add( "-XX:-FailOverToOldVerifier")
systemProperty("kotlin.test.box.d8.disable", true)
}
testsJar()