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

Show compiler error in diff if JPS IC test fails

Browse Source
This commit is contained in:
Aleksei.Cherepanov
2024-01-15 17:51:05 +01:00
committed by Space Team
parent 0cebf2b39f
commit 32bc2b55ed
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+5 -3
View File
@@ -337,11 +337,13 @@ abstract class AbstractIncrementalJpsTest(
buildLogFile?.let { buildLogFile?.let {
val logs = createBuildLog(otherMakeResults) val logs = createBuildLog(otherMakeResults)
val expected = excludeCompilerErrorMessagesFromLog(File(buildLogFile.absolutePath).readText()) val buildLog = File(buildLogFile.absolutePath).readText()
val expected = excludeCompilerErrorMessagesFromLog(buildLog)
val actual = excludeCompilerErrorMessagesFromLog(logs) val actual = excludeCompilerErrorMessagesFromLog(logs)
UsefulTestCase.assertEquals(expected.trimEnd(), actual.trimEnd()) if(expected.trimEnd() != actual.trimEnd()) {
UsefulTestCase.assertEquals(buildLog, logs)
}
val lastMakeResult = otherMakeResults.last() val lastMakeResult = otherMakeResults.last()
clearCachesRebuildAndCheckOutput(lastMakeResult) clearCachesRebuildAndCheckOutput(lastMakeResult)
} }