azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Simplify regexp for extracting task output in integration tests

Browse Source 
Gradle has slightly changed logging since 7.6, so the old way stopped working
#KT-53811 In Progress
This commit is contained in:
Alexander.Likhachev
2023-01-13 22:12:08 +01:00
committed by Space Team
parent 4b1c7f1c11
commit 46e45b8137
3 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+6 -10
View File
@@ -721,16 +721,12 @@ abstract class BaseGradleIT {
fun CompiledProject.getOutputForTask(taskName: String): String { fun CompiledProject.getOutputForTask(taskName: String): String {
@Language("RegExp") @Language("RegExp")
val taskOutputRegex = """ val taskOutputRegex = """
(?: \[org\.gradle\.internal\.operations\.DefaultBuildOperationRunner] Build operation 'Task :$taskName' started
\[LIFECYCLE] \[class org\.gradle(?:\.internal\.buildevents)?\.TaskExecutionLogger] :$taskName| ([\s\S]+?)
\[org\.gradle\.execution\.(?:plan|taskgraph)\.Default(?:Task)?PlanExecutor] :$taskName.*?started \[org\.gradle\.internal\.operations\.DefaultBuildOperationRunner] Build operation 'Task :$taskName' completed
) """.trimIndent()
([\s\S]+?) .replace("\n", "")
(?: .toRegex()
Finished executing task ':$taskName'|
\[org\.gradle\.execution\.(?:plan|taskgraph)\.Default(?:Task)?PlanExecutor] :$taskName.*?completed
)
""".trimIndent().replace("\n", "").toRegex()
return taskOutputRegex.find(output)?.run { groupValues[1] } ?: error("Cannot find output for task $taskName") return taskOutputRegex.find(output)?.run { groupValues[1] } ?: error("Cannot find output for task $taskName")
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
+2 -2
View File
@@ -285,8 +285,8 @@ open class KaptIncrementalIT : KGPBaseTest() {
val useBKt = javaSourcesDir().resolve("bar/useB.kt") val useBKt = javaSourcesDir().resolve("bar/useB.kt")
assertCompiledKotlinSources( assertCompiledKotlinSources(
listOf(projectPath.relativize(bKt), projectPath.relativize(useBKt)), listOf(projectPath.relativize(bKt), projectPath.relativize(useBKt)),
getOutputForTask("kaptGenerateStubs"), getOutputForTask("kaptGenerateStubsKotlin"),
errorMessageSuffix = " in task 'kaptGenerateStubs'" errorMessageSuffix = " in task 'kaptGenerateStubsKotlin'"
) )
// java removal is detected // java removal is detected
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/compilationAssertions.kt
+4 -10
View File
@@ -21,16 +21,10 @@ private val javaSrcRegex by lazy { Regex("\\[DEBUG] \\[[^]]*JavaCompiler] Compil
private fun taskOutputRegex( private fun taskOutputRegex(
taskName: String taskName: String
) = """ ) = """
(?: \[org\.gradle\.internal\.operations\.DefaultBuildOperationRunner] Build operation 'Task :$taskName' started
\[LIFECYCLE] \[class org\.gradle(?:\.internal\.buildevents)?\.TaskExecutionLogger] :$taskName| ([\s\S]+?)
\[org\.gradle\.execution\.(?:plan|taskgraph)\.Default(?:Task)?PlanExecutor] :$taskName.*?started \[org\.gradle\.internal\.operations\.DefaultBuildOperationRunner] Build operation 'Task :$taskName' completed
) """.trimIndent()
([\s\S]+?)
(?:
Finished executing task ':$taskName'|
\[org\.gradle\.execution\.(?:plan|taskgraph)\.Default(?:Task)?PlanExecutor] :$taskName.*?completed
)
""".trimIndent()
.replace("\n", "") .replace("\n", "")
.toRegex() .toRegex()