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

Sort smap data by output file name

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-05-16 11:46:24 +02:00
parent 3e50203283
commit 47c5e64ba5
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt
+7 -6
View File
@@ -41,7 +41,7 @@ object SMAPTestUtil {
} }
}, 0) }, 0)
SMAPAndFile.SMAPAndFile(debugInfo, outputFile.sourceFiles.single()) SMAPAndFile.SMAPAndFile(debugInfo, outputFile.sourceFiles.single(), outputFile.relativePath)
} }
} }
@@ -57,7 +57,7 @@ object SMAPTestUtil {
} }
}.trim() }.trim()
return SMAPAndFile(if (content.isNotEmpty()) content else null, SMAPAndFile.getPath(file.name)) return SMAPAndFile(if (content.isNotEmpty()) content else null, SMAPAndFile.getPath(file.name), "NOT_SORTED")
} }
fun checkSMAP(inputFiles: List<CodegenTestCase.TestFile>, outputFiles: Iterable<OutputFile>) { fun checkSMAP(inputFiles: List<CodegenTestCase.TestFile>, outputFiles: Iterable<OutputFile>) {
@@ -68,8 +68,8 @@ object SMAPTestUtil {
val compiledData = compiledSmaps.groupBy { val compiledData = compiledSmaps.groupBy {
it.sourceFile it.sourceFile
}.map { }.map {
val smap = it.value.mapNotNull { it.smap }.joinToString("\n") val smap = it.value.sortedByDescending { it.outputFile }.mapNotNull { it.smap }.joinToString("\n")
SMAPAndFile(if (smap.isNotEmpty()) smap else null, it.key) SMAPAndFile(if (smap.isNotEmpty()) smap else null, it.key, "NOT_SORTED")
}.associateBy { it.sourceFile } }.associateBy { it.sourceFile }
for (source in sourceData) { for (source in sourceData) {
@@ -107,9 +107,10 @@ object SMAPTestUtil {
private fun normalize(text: String?) = private fun normalize(text: String?) =
text?.let { StringUtil.convertLineSeparators(it.trim()) } text?.let { StringUtil.convertLineSeparators(it.trim()) }
private class SMAPAndFile(val smap: String?, val sourceFile: String) { private class SMAPAndFile(val smap: String?, val sourceFile: String, val outputFile: String) {
companion object { companion object {
fun SMAPAndFile(smap: String?, sourceFile: File) = SMAPAndFile(smap, getPath(sourceFile)) fun SMAPAndFile(smap: String?, sourceFile: File, outputFile: String) =
SMAPAndFile(smap, getPath(sourceFile), outputFile)
fun getPath(file: File): String { fun getPath(file: File): String {
return getPath(file.canonicalPath) return getPath(file.canonicalPath)