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

[Tests] Fix deadlock caused by eager initialization in JspecifyMarksCleanupPreprocessor

Browse Source
This commit is contained in:
Kirill Rakhman
2023-09-18 11:27:35 +02:00
committed by Space Team
parent 59f544cb7c
commit 51a3fe367c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/preprocessors/JspecifyMarksCleanupPreprocessor.kt
+5 -5
View File
@@ -11,9 +11,9 @@ import org.jetbrains.kotlin.test.services.*
class JspecifyMarksCleanupPreprocessor(testServices: TestServices) : SourceFilePreprocessor(testServices) {
override fun process(file: TestFile, content: String) = content.replace(regexToCleanup, "")
companion object {
private val jspecifyMarks = diagnosticsToJspecifyMarks.values.map { it.values }.flatten().joinToString("|")
private val regexToCleanup = Regex("""[ ]*// ($jspecifyMarks)(, ($jspecifyMarks))*(?:\r\n|\n)""")
}
}
// Properties need to be outside the preprocessor so that they aren't eagerly initialized, which leads to a deadlock
// when too many tests that have a dependency on this class are executed in parallel.
private val jspecifyMarks = diagnosticsToJspecifyMarks.values.map { it.values }.flatten().joinToString("|")
private val regexToCleanup = Regex("""[ ]*// ($jspecifyMarks)(, ($jspecifyMarks))*(?:\r\n|\n)""")