From 8af5ade2f4c38021c6980e923ba77d1cb5577298 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 26 Sep 2022 14:10:37 +0200 Subject: [PATCH] Fix regular expressions in testHostSpecificSourceSetsInTransitiveDependencies Test is now flaky because sometimes the expected names has checksum with the `-` char. `published-dependency-1.0-commonMain-Q-PvLQ.klib` --- .../kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt index b685507139b..f40a51bd02a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt @@ -92,10 +92,10 @@ class KlibBasedMppIT : BaseGradleIT() { checkTaskCompileClasspath( "compile${hostSpecificSourceSet.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}KotlinMetadata", listOf( - "published-producer-1.0-$hostSpecificSourceSet-\\w+.klib", - "published-producer-1.0-commonMain-\\w+.klib", - "published-dependency-1.0-$hostSpecificSourceSet-\\w+.klib", - "published-dependency-1.0-commonMain-\\w+.klib" + "published-producer-1.0-$hostSpecificSourceSet-[\\w-]+.klib", + "published-producer-1.0-commonMain-[\\w-]+.klib", + "published-dependency-1.0-$hostSpecificSourceSet-[\\w-]+.klib", + "published-dependency-1.0-commonMain-[\\w-]+.klib" ).map(::Regex) ) }