From e63e4b17b7e2fd6e003b04401835f6077445e92a Mon Sep 17 00:00:00 2001 From: Dmitrii Krasnov Date: Mon, 2 Oct 2023 17:01:42 +0200 Subject: [PATCH] [Gradle IT] Fixed regex for extracting task log on Windows #KT-51553 Ready for Review --- .../kotlin/gradle/testbase/outputHelpers.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/outputHelpers.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/outputHelpers.kt index 4b2afef361b..2f6536c53ab 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/outputHelpers.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/outputHelpers.kt @@ -23,13 +23,14 @@ private fun taskOutputRegexForDebugLog( @Language("RegExp") private fun taskOutputRegexForInfoLog( taskName: String, -) = """ - ^\s*$ - ^> Task $taskName$ - ([\s\S]+?) - ^\s*$ +) = + """ + ^\s*$\r? + ^> Task $taskName$\r? + ([\s\S]+?)\r? + ^\s*$\r? """.trimIndent() - .toRegex(RegexOption.MULTILINE) + .toRegex(RegexOption.MULTILINE) /** * Gets the output produced by a specific task during a Gradle build.