From 5b1581486b6a06a7dfeb1fbadedd121561061906 Mon Sep 17 00:00:00 2001 From: Pavel Kunyavskiy Date: Tue, 21 Jun 2022 11:40:41 +0200 Subject: [PATCH] [K/N] Disable safepoint removal test with non-default gc --- kotlin-native/backend.native/tests/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index 2d903ff71d4..2e594b6f2b2 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -98,6 +98,7 @@ ext.isExperimentalMM = !(project.globalTestArgs.contains("-memory-model") && project.testTarget != 'wasm32' 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=") } // TODO: It also makes sense to test -g without asserts, and also to test -opt with asserts. if (project.globalTestArgs.contains("-g")) { @@ -6065,7 +6066,7 @@ if (HostManager.@Companion.hostIsMac) { } fileCheckTest("filecheck_redundant_safepoints_removal") { - enabled = isExperimentalMM && + enabled = isExperimentalMM && isCmsGC && project.globalTestArgs.contains("-opt") && project.testTarget != "watchos_arm32" && project.testTarget != "ios_arm32"