JPS tests: support _dependencies.txt and _steps.txt for better files sorting

Original commit: 313c27859a
This commit is contained in:
Sergey Rostov
2018-09-10 15:09:24 +03:00
parent 461df40078
commit ac5fbd4080
2 changed files with 11 additions and 4 deletions
@@ -281,8 +281,15 @@ abstract class AbstractIncrementalJpsTest(
get() = File(testDataDir, "dependencies.txt")
private fun readModulesTxt(): ModulesTxt? {
if (!modulesTxtFile.exists()) return null
return ModulesTxtBuilder().readFile(modulesTxtFile)
var actualModulesTxtFile = modulesTxtFile
if (!actualModulesTxtFile.exists()) {
// also try `"_${fileName}.txt"`. Useful for sorting files in IDE.
actualModulesTxtFile = modulesTxtFile.parentFile.resolve("_" + modulesTxtFile.name)
if (!actualModulesTxtFile.exists()) return null
}
return ModulesTxtBuilder().readFile(actualModulesTxtFile)
}
protected open fun createBuildLog(incrementalMakeResults: List<AbstractIncrementalJpsTest.MakeResult>): String =
@@ -416,7 +423,7 @@ abstract class AbstractIncrementalJpsTest(
TouchPolicy.TIMESTAMP
)
val stepsTxt = File(testDataSrc, "steps.txt")
val stepsTxt = File(testDataSrc, "_steps.txt")
val modificationNames = if (stepsTxt.exists()) stepsTxt.readLines() else null
modifications.forEachIndexed { index, step ->
@@ -273,7 +273,7 @@ class MppJpsIncTestsGenerator(val txt: ModulesTxt, val testCaseDirProvider: (Tes
}
protected fun generateStepsTxt() {
File(dir, "steps.txt").setFileContent(steps.joinToString("\n"))
File(dir, "_steps.txt").setFileContent(steps.joinToString("\n"))
}
fun generateBaseContent() {