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

Allow ProtoBufCompareConsistencyTest to work on teamcity

Browse Source
This commit is contained in:
Nikolay Krasko
2021-04-07 21:05:02 +03:00
committed by TeamCityServer
parent 14ead33db6
commit 7d78e610b1
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/main/GeneratorsFileUtil.kt
+7 -3
View File
@@ -17,10 +17,12 @@ object GeneratorsFileUtil {
@JvmStatic @JvmStatic
@JvmOverloads @JvmOverloads
@Throws(IOException::class) @Throws(IOException::class)
fun writeFileIfContentChanged(file: File, newText: String, logNotChanged: Boolean = true) { fun writeFileIfContentChanged(file: File, newText: String, logNotChanged: Boolean = true, forbidGenerationOnTeamcity: Boolean = true) {
val parentFile = file.parentFile val parentFile = file.parentFile
if (!parentFile.exists()) { if (!parentFile.exists()) {
if (failOnTeamCity("Create dir `${parentFile.path}`")) return if (forbidGenerationOnTeamcity) {
if (failOnTeamCity("Create dir `${parentFile.path}`")) return
}
if (parentFile.mkdirs()) { if (parentFile.mkdirs()) {
println("Directory created: " + parentFile.absolutePath) println("Directory created: " + parentFile.absolutePath)
} else { } else {
@@ -33,7 +35,9 @@ object GeneratorsFileUtil {
} }
return return
} }
if (failOnTeamCity("Write file `${file.toPath()}`")) return if (forbidGenerationOnTeamcity) {
if (failOnTeamCity("Write file `${file.toPath()}`")) return
}
val useTempFile = !SystemInfo.isWindows val useTempFile = !SystemInfo.isWindows
val targetFile = file.toPath() val targetFile = file.toPath()
val tempFile = val tempFile =
generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
+3 -2
View File
@@ -38,8 +38,9 @@ class GenerateProtoBufCompare {
generate(DEST_FILE) generate(DEST_FILE)
} }
fun generate(destFile: File) { fun generate(destFile: File, forbidGenerationOnTeamcity: Boolean = true) {
GeneratorsFileUtil.writeFileIfContentChanged(destFile, GenerateProtoBufCompare().generate()) GeneratorsFileUtil.writeFileIfContentChanged(destFile, GenerateProtoBufCompare().generate(),
forbidGenerationOnTeamcity = forbidGenerationOnTeamcity)
} }
} }
generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufCompareConsistencyTest.kt
+1 -1
View File
@@ -26,7 +26,7 @@ class ProtoBufCompareConsistencyTest : TestCase() {
fun testAlreadyGenerated() { fun testAlreadyGenerated() {
val testDir = KtTestUtil.tmpDir("testDirectory") val testDir = KtTestUtil.tmpDir("testDirectory")
val newFile = File(testDir, "ProtoCompareGenerated.kt") val newFile = File(testDir, "ProtoCompareGenerated.kt")
GenerateProtoBufCompare.generate(newFile) GenerateProtoBufCompare.generate(newFile, forbidGenerationOnTeamcity = false)
KotlinTestUtils.assertEqualsToFile(newFile, FileUtil.loadFile(GenerateProtoBufCompare.DEST_FILE)) KotlinTestUtils.assertEqualsToFile(newFile, FileUtil.loadFile(GenerateProtoBufCompare.DEST_FILE))
} }