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

Delete daemon client file when Gradle process stops

Browse Source 
#KT-17177 fixed
This commit is contained in:
Alexey Tsvetkov
2017-04-12 15:42:26 +03:00
parent 34a8896ad4
commit e160931ec5
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinDaemonIT.kt
+17 -4
View File
@@ -16,12 +16,10 @@
package org.jetbrains.kotlin.gradle package org.jetbrains.kotlin.gradle
import org.jetbrains.kotlin.compilerRunner.COULD_NOT_CONNECT_TO_DAEMON_MESSAGE import org.jetbrains.kotlin.compilerRunner.*
import org.jetbrains.kotlin.compilerRunner.CREATED_SESSION_FILE_PREFIX
import org.jetbrains.kotlin.compilerRunner.DELETED_SESSION_FILE_PREFIX
import org.jetbrains.kotlin.compilerRunner.EXISTING_SESSION_FILE_PREFIX
import org.junit.Assert import org.junit.Assert
import org.junit.Test import org.junit.Test
import java.io.File
// todo: test client file creation/deletion // todo: test client file creation/deletion
// todo: test daemon start (does not start every build) // todo: test daemon start (does not start every build)
@@ -77,4 +75,19 @@ class KotlinDaemonIT : BaseGradleIT() {
Assert.assertArrayEquals("Sessions should not be deleted (incremental build)", deletedSessions, emptyArray()) Assert.assertArrayEquals("Sessions should not be deleted (incremental build)", deletedSessions, emptyArray())
} }
} }
@Test
fun testClientFileIsDeletedOnExit() {
val project = Project("kotlinProject", GRADLE_VERSION)
val options = defaultBuildOptions().copy(withDaemon = false)
project.build("assemble", options = options) {
val regex = Regex("(?m)($CREATED_CLIENT_FILE_PREFIX|$EXISTING_CLIENT_FILE_PREFIX)(.+)$")
val clientFiles = regex.findAll(output).toList().map { File(it.groupValues[2]) }
assert(clientFiles.isNotEmpty()) { "No client files in log" }
clientFiles.forEach { clientFile ->
assert(!clientFile.exists()) { "Client file $clientFile is expected to be deleted!" }
}
}
}
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+4 -4
View File
@@ -304,11 +304,11 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
val log = project.logger val log = project.logger
if (clientIsAliveFlagFile == null || !clientIsAliveFlagFile!!.exists()) { if (clientIsAliveFlagFile == null || !clientIsAliveFlagFile!!.exists()) {
val projectName = project.rootProject.name.normalizeForFlagFile() val projectName = project.rootProject.name.normalizeForFlagFile()
clientIsAliveFlagFile = FileUtil.createTempFile("kotlin-compiler-in-$projectName-", ".alive") clientIsAliveFlagFile = FileUtil.createTempFile("kotlin-compiler-in-$projectName-", ".alive", /*deleteOnExit =*/ true)
log.kotlinDebug { CREATED_CLIENT_FILE_PREFIX + clientIsAliveFlagFile!!.relativeToRoot(project) } log.kotlinDebug { CREATED_CLIENT_FILE_PREFIX + clientIsAliveFlagFile!!.canonicalPath }
} }
else { else {
log.kotlinDebug { EXISTING_CLIENT_FILE_PREFIX + clientIsAliveFlagFile!!.relativeToRoot(project) } log.kotlinDebug { EXISTING_CLIENT_FILE_PREFIX + clientIsAliveFlagFile!!.canonicalPath }
} }
return clientIsAliveFlagFile!! return clientIsAliveFlagFile!!
@@ -329,7 +329,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
val log = project.logger val log = project.logger
if (sessionFlagFile == null || !sessionFlagFile!!.exists()) { if (sessionFlagFile == null || !sessionFlagFile!!.exists()) {
val sessionFilesDir = sessionsDir(project).apply { mkdirs() } val sessionFilesDir = sessionsDir(project).apply { mkdirs() }
sessionFlagFile = FileUtil.createTempFile(sessionFilesDir, "kotlin-compiler-", ".salive") sessionFlagFile = FileUtil.createTempFile(sessionFilesDir, "kotlin-compiler-", ".salive", /*deleteOnExit =*/ true)
log.kotlinDebug { CREATED_SESSION_FILE_PREFIX + sessionFlagFile!!.relativeToRoot(project) } log.kotlinDebug { CREATED_SESSION_FILE_PREFIX + sessionFlagFile!!.relativeToRoot(project) }
} }
else { else {