diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index d72a594ce5d..ecfbe241349 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -860,7 +860,10 @@ Finished executing task ':$taskName'| } } - val actualTestResults = readAndCleanupTestResults(testReportDirs, projectDir.toPath()) + val actualTestResults = readAndCleanupTestResults(testReportDirs, projectDir.toPath()) { s -> + val excl = "Invalid connection: com.apple.coresymbolicationd" + s.lines().filter { it != excl }.joinToString("\n") + } val expectedTestResults = prettyPrintXml(resourcesRootFile.resolve(assertionFileName).readText()) assertEquals(expectedTestResults, actualTestResults) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testAssertions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testAssertions.kt index 759ce9f713a..f71676d182d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testAssertions.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testAssertions.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.gradle.testbase +import org.jdom.CDATA +import org.jdom.Content import org.jdom.Element import org.jdom.input.SAXBuilder import org.jdom.output.Format @@ -28,7 +30,11 @@ fun GradleProject.assertTestResults(expectedTestReport: Path, vararg testReportN assertEquals(expectedTestResults, actualTestResults) } -internal fun readAndCleanupTestResults(testReportDirs: List, projectPath: Path): String { +internal fun readAndCleanupTestResults( + testReportDirs: List, + projectPath: Path, + cleanupStdOut: (String) -> String = { it } +): String { val files = testReportDirs .flatMap { it.allFilesWithExtension("xml") @@ -64,6 +70,15 @@ internal fun readAndCleanupTestResults(testReportDirs: List, projectPath: it.value = "..." } } + if (e.name == "system-out") { + val content = e.content.map { + if (it.cType == Content.CType.CDATA) { + (it as CDATA).text = cleanupStdOut(it.value) + } + it + } + e.setContent(content) + } e.children.forEach { cleanup(it) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/TEST-TestKt-iOSsim_wWarn.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/TEST-TestKt-iOSsim_wWarn.xml index f47c5c5ceb4..b54d15b1a04 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/TEST-TestKt-iOSsim_wWarn.xml +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-tests/TEST-TestKt-iOSsim_wWarn.xml @@ -11,7 +11,6 @@