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

Use proper jvmArgs syntax, remove -FailOverToOldVerifier from last configurations

Browse Source 
`FailOverToOldVerifier` support is removed from JDK 16
This commit is contained in:
Mikhael Bogdanov
2021-02-09 16:29:27 +01:00
parent c54354f348
commit 2673261b10
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-different-jdk/build.gradle.kts
+5 -10
View File
@@ -84,15 +84,15 @@ codegenTest(target = 11, jvm = 11) {}
//JDK 15 //JDK 15
codegenTest(target = 6, jvm = 15) { codegenTest(target = 6, jvm = 15) {
jvmArgs!!.add( "-XX:-FailOverToOldVerifier") jvmArgs( "-XX:-FailOverToOldVerifier")
} }
codegenTest(target = 8, jvm = 15) { codegenTest(target = 8, jvm = 15) {
jvmArgs!!.add( "-XX:-FailOverToOldVerifier") jvmArgs( "-XX:-FailOverToOldVerifier")
} }
codegenTest(target = 15, jvm = 15) { codegenTest(target = 15, jvm = 15) {
jvmArgs!!.add( "-XX:-FailOverToOldVerifier") jvmArgs( "-XX:-FailOverToOldVerifier")
systemProperty("kotlin.test.box.d8.disable", true) systemProperty("kotlin.test.box.d8.disable", true)
} }
@@ -100,13 +100,9 @@ codegenTest(target = 15, jvm = 15) {
val mostRecentJdk = JdkMajorVersion.values().last().name val mostRecentJdk = JdkMajorVersion.values().last().name
//LAST JDK from JdkMajorVersion available on machine //LAST JDK from JdkMajorVersion available on machine
codegenTest(target = 6, jvm = "Last", jdk = mostRecentJdk) { codegenTest(target = 6, jvm = "Last", jdk = mostRecentJdk) {}
jvmArgs!!.add( "-XX:-FailOverToOldVerifier")
}
codegenTest(target = 8, jvm = "Last", jdk = mostRecentJdk) { codegenTest(target = 8, jvm = "Last", jdk = mostRecentJdk) {}
jvmArgs!!.add( "-XX:-FailOverToOldVerifier")
}
codegenTest( codegenTest(
mostRecentJdk.substringAfter('_').toInt(), mostRecentJdk.substringAfter('_').toInt(),
@@ -114,7 +110,6 @@ codegenTest(
jvm = "Last", jvm = "Last",
jdk = mostRecentJdk jdk = mostRecentJdk
) { ) {
jvmArgs!!.add( "-XX:-FailOverToOldVerifier")
systemProperty("kotlin.test.box.d8.disable", true) systemProperty("kotlin.test.box.d8.disable", true)
} }