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

Fix Configuration cache tests after ee756638

Browse Source 
Fix flaky tests:
* ConfigurationCacheIT.testInstantExecutionWithBuildSrc
* ConfigurationCacheIT.testInstantExecutionWithIncludedBuildPlugin

#KT-51374 Fixed
This commit is contained in:
Aleksei.Cherepanov
2022-03-04 17:13:56 +03:00
committed by Space
parent 7b7ed8c110
commit b308ce3f65
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt
+11 -8
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.utils package org.jetbrains.kotlin.gradle.utils
import org.gradle.api.InvalidUserCodeException
import org.gradle.api.Project import org.gradle.api.Project
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
@@ -30,16 +31,18 @@ internal fun Iterable<File>.toPathsArray(): Array<String> =
map { it.canonicalPath }.toTypedArray() map { it.canonicalPath }.toTypedArray()
internal fun newTmpFile(prefix: String, suffix: String? = null, directory: File? = null, deleteOnExit: Boolean = true): File { internal fun newTmpFile(prefix: String, suffix: String? = null, directory: File? = null, deleteOnExit: Boolean = true): File {
val tempDir = directory return try {
?: System.getProperty("java.io.tmpdir", null)?.trim()?.ifEmpty { null }?.let { Paths.get(it) }?.toFile() (if (directory == null) Files.createTempFile(prefix, suffix) else Files.createTempFile(directory.toPath(), prefix, suffix))
?: throw IOException("Temporary directory not specified") } catch (e: NoSuchFileException) {
val parentDir = e.file.parentFile
if (tempDir.isFile) throw IOException("Temp folder $tempDir is not a directory") if (parentDir.isFile) throw IOException("Temp folder $parentDir is not a directory")
if (!tempDir.isDirectory) { if (!parentDir.isDirectory) {
if (!tempDir.mkdirs()) throw IOException("Could not create temp directory $tempDir") if (!parentDir.mkdirs()) throw IOException("Could not create temp directory $parentDir")
} }
return Files.createTempFile(tempDir.toPath(), prefix, suffix).toFile().apply { if (deleteOnExit) deleteOnExit() } Files.createTempFile(parentDir.toPath(), prefix, suffix)
}.toFile().apply { if (deleteOnExit) deleteOnExit() }
} }
internal fun File.isParentOf(childCandidate: File, strict: Boolean = false): Boolean { internal fun File.isParentOf(childCandidate: File, strict: Boolean = false): Boolean {