From a1ddbb3fe552c4d90b59f8efc9b3e6f4a094b1de Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 26 Jan 2016 14:43:32 +0100 Subject: [PATCH] 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 KT-8487 --- .../kotlin/gradle/BaseIncrementalGradleIT.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseIncrementalGradleIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseIncrementalGradleIT.kt index e745bfa178a..977f3be8fc7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseIncrementalGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseIncrementalGradleIT.kt @@ -178,8 +178,9 @@ repositories { } -private val knownExtensions = arrayListOf("kt", "java") -private val knownModifyExtensions = arrayListOf("new", "touch", "delete") +private val supportedSourceExtensions = arrayListOf("kt", "java") +private val supportedModifyExtensions = arrayListOf("new", "delete") +private val unsupportedModifyExtensions = arrayListOf("touch") private fun String.toIntOr(defaultVal: Int): Pair { try { @@ -202,10 +203,12 @@ fun testIsKnownJpsTestProject(projectRoot: File): Pair { val (fileStage, hasStage) = nameParts.last().toIntOr(0) val modifyExt = nameParts[nameParts.size - (if (hasStage) 2 else 1)] 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}") } - if (!hasKnownSources && it.extension in knownExtensions) { + if (!hasKnownSources && it.extension in supportedSourceExtensions) { hasKnownSources = true } }