From 8ba3bdaf2e02461b0222d982abd55039b180b51a Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Mon, 25 Jul 2022 19:53:12 +0300 Subject: [PATCH] [K/N][tests] Fixed the predicate when to enable the test --- kotlin-native/backend.native/tests/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index 05f7c18df59..d435344b21d 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -99,12 +99,14 @@ ext.isExperimentalMM = !(project.globalTestArgs.contains("-memory-model") && ext.isNoopGC = project.globalTestArgs.contains("-Xgc=noop") ext.isAggressiveGC = project.globalTestArgs.contains("-Xbinary=gcSchedulerType=aggressive") 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. if (project.globalTestArgs.contains("-g") && (cacheTesting == null)) { tasks.withType(KonanCompileNativeBinary.class).configureEach { extraOpts "-Xbinary=runtimeAssertionsMode=panic" } + ext.runtimeAssertionsPanic = true } if (!isExperimentalMM) { @@ -5691,7 +5693,7 @@ if (isAppleTarget(project)) { frameworkTest("testMultipleFrameworksStatic") { // 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. expectedExitStatus = 134 }