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

skipping tests that using "touch" modification, since gradle do not consider mere timestamp touching as a change and do not call kotlin plugin on it

Browse Source 
KT-8487
This commit is contained in:
Ilya Chernikov
2016-01-26 14:43:32 +01:00
committed by Alexey Tsvetkov
parent c5617f1274
commit a1ddbb3fe5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseIncrementalGradleIT.kt
+7 -4
View File
@@ -178,8 +178,9 @@ repositories {
} }
private val knownExtensions = arrayListOf("kt", "java") private val supportedSourceExtensions = arrayListOf("kt", "java")
private val knownModifyExtensions = arrayListOf("new", "touch", "delete") private val supportedModifyExtensions = arrayListOf("new", "delete")
private val unsupportedModifyExtensions = arrayListOf("touch")
private fun String.toIntOr(defaultVal: Int): Pair<Int, Boolean> { private fun String.toIntOr(defaultVal: Int): Pair<Int, Boolean> {
try { try {
@@ -202,10 +203,12 @@ fun testIsKnownJpsTestProject(projectRoot: File): Pair<Boolean, String?> {
val (fileStage, hasStage) = nameParts.last().toIntOr(0) val (fileStage, hasStage) = nameParts.last().toIntOr(0)
val modifyExt = nameParts[nameParts.size - (if (hasStage) 2 else 1)] val modifyExt = nameParts[nameParts.size - (if (hasStage) 2 else 1)]
val ext = nameParts[nameParts.size - (if (hasStage) 3 else 2)] val ext = nameParts[nameParts.size - (if (hasStage) 3 else 2)]
if (modifyExt in knownModifyExtensions && ext !in knownExtensions) if (modifyExt in unsupportedModifyExtensions)
return@testIsKnownJpsTestProject Pair(false, "unsupported modification extension ${it.name}")
if (modifyExt in supportedModifyExtensions && ext !in supportedSourceExtensions)
return@testIsKnownJpsTestProject Pair(false, "unknown staged file ${it.name}") return@testIsKnownJpsTestProject Pair(false, "unknown staged file ${it.name}")
} }
if (!hasKnownSources && it.extension in knownExtensions) { if (!hasKnownSources && it.extension in supportedSourceExtensions) {
hasKnownSources = true hasKnownSources = true
} }
} }