From 94f99632303f041c3cd6c9f33b1bbe1e05f71249 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 9 Aug 2022 15:07:19 +0200 Subject: [PATCH] [Native][tests] Update test warnings filter to reflect changes in partial linkage warnings --- .../compilation/NativeTestGroupingMessageCollector.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/NativeTestGroupingMessageCollector.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/NativeTestGroupingMessageCollector.kt index ca037f5b13b..50f8eb6ea6c 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/NativeTestGroupingMessageCollector.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/NativeTestGroupingMessageCollector.kt @@ -111,7 +111,7 @@ internal class NativeTestGroupingMessageCollector( } private fun isPartialLinkageWarning(message: String): Boolean = - partialLinkageEnabled && PARTIAL_LINKAGE_WARNING_REGEXES.any { regex -> message.matches(regex) } + partialLinkageEnabled && message.matches(PARTIAL_LINKAGE_WARNING_REGEX) override fun hasErrors() = hasWarningsWithRaisedSeverity || super.hasErrors() @@ -119,12 +119,7 @@ internal class NativeTestGroupingMessageCollector( private const val PRE_RELEASE_WARNING_PREFIX = "Following manually enabled features will force generation of pre-release binaries: " private const val UNSAFE_COMPILER_ARGS_WARNING_PREFIX = "ATTENTION!\nThis build uses unsafe internal compiler arguments:\n\n" private const val LIBRARY_INCLUDED_MORE_THAN_ONCE_WARNING_PREFIX = "library included more than once: " - - private val PARTIAL_LINKAGE_WARNING_REGEXES = listOf( - Regex("Accessing declaration with unlinked symbol .+"), - Regex("Expression type contains unlinked symbol"), - Regex("\\S+ declaration .+ contains unlinked symbols") - ) + private val PARTIAL_LINKAGE_WARNING_REGEX = Regex(".+ uses unlinked symbols(:.*)?") private fun parseLanguageFeatureArg(arg: String): String? = substringAfter(arg, "-XXLanguage:-") ?: substringAfter(arg, "-XXLanguage:+")