[K/N][tests] Fixed the predicate when to enable the test
This commit is contained in:
@@ -99,12 +99,14 @@ ext.isExperimentalMM = !(project.globalTestArgs.contains("-memory-model") &&
|
|||||||
ext.isNoopGC = project.globalTestArgs.contains("-Xgc=noop")
|
ext.isNoopGC = project.globalTestArgs.contains("-Xgc=noop")
|
||||||
ext.isAggressiveGC = project.globalTestArgs.contains("-Xbinary=gcSchedulerType=aggressive")
|
ext.isAggressiveGC = project.globalTestArgs.contains("-Xbinary=gcSchedulerType=aggressive")
|
||||||
ext.isCmsGC = project.globalTestArgs.contains("-Xgc=cms") || !project.globalTestArgs.any { it.startsWith("-Xgc=") }
|
ext.isCmsGC = project.globalTestArgs.contains("-Xgc=cms") || !project.globalTestArgs.any { it.startsWith("-Xgc=") }
|
||||||
|
ext.runtimeAssertionsPanic = false
|
||||||
|
|
||||||
// TODO: It also makes sense to test -g without asserts, and also to test -opt with asserts.
|
// TODO: It also makes sense to test -g without asserts, and also to test -opt with asserts.
|
||||||
if (project.globalTestArgs.contains("-g") && (cacheTesting == null)) {
|
if (project.globalTestArgs.contains("-g") && (cacheTesting == null)) {
|
||||||
tasks.withType(KonanCompileNativeBinary.class).configureEach {
|
tasks.withType(KonanCompileNativeBinary.class).configureEach {
|
||||||
extraOpts "-Xbinary=runtimeAssertionsMode=panic"
|
extraOpts "-Xbinary=runtimeAssertionsMode=panic"
|
||||||
}
|
}
|
||||||
|
ext.runtimeAssertionsPanic = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isExperimentalMM) {
|
if (!isExperimentalMM) {
|
||||||
@@ -5691,7 +5693,7 @@ if (isAppleTarget(project)) {
|
|||||||
|
|
||||||
frameworkTest("testMultipleFrameworksStatic") {
|
frameworkTest("testMultipleFrameworksStatic") {
|
||||||
// this test doesn't work with caches. For now caches are enabled only if isExperimentalMM is true, even if cacheTesting is passed
|
// this test doesn't work with caches. For now caches are enabled only if isExperimentalMM is true, even if cacheTesting is passed
|
||||||
if (cacheTesting != null && isExperimentalMM) {
|
if (cacheTesting != null && isExperimentalMM && !runtimeAssertionsPanic) {
|
||||||
// See https://youtrack.jetbrains.com/issue/KT-34261.
|
// See https://youtrack.jetbrains.com/issue/KT-34261.
|
||||||
expectedExitStatus = 134
|
expectedExitStatus = 134
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user