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

Minor: use unique temp directories in jps-build tests

Browse Source
This commit is contained in:
Nikolay Krasko
2020-12-03 19:42:56 +03:00
parent 1ee0892f73
commit 2d8bdcbc9b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+1 -1
View File
@@ -300,7 +300,7 @@ abstract class AbstractIncrementalJpsTest(
protected open fun doTest(testDataPath: String) { protected open fun doTest(testDataPath: String) {
testDataDir = File(testDataPath) testDataDir = File(testDataPath)
workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "aijt-jps-build", null)
val buildLogFile = buildLogFinder.findBuildLog(testDataDir) val buildLogFile = buildLogFinder.findBuildLog(testDataDir)
Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) }) Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) })
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201
+1 -1
View File
@@ -301,7 +301,7 @@ abstract class AbstractIncrementalJpsTest(
protected open fun doTest(testDataPath: String) { protected open fun doTest(testDataPath: String) {
testDataDir = File(testDataPath) testDataDir = File(testDataPath)
workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "aijt-jps-build", null)
val buildLogFile = buildLogFinder.findBuildLog(testDataDir) val buildLogFile = buildLogFinder.findBuildLog(testDataDir)
Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) }) Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) })
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt
+1 -1
View File
@@ -33,7 +33,7 @@ abstract class KotlinJpsBuildTestBase : AbstractKotlinJpsBuildTestCase() {
protected open fun copyTestDataToTmpDir(testDataDir: File): File { protected open fun copyTestDataToTmpDir(testDataDir: File): File {
assert(testDataDir.exists()) { "Cannot find source folder " + testDataDir.absolutePath } assert(testDataDir.exists()) { "Cannot find source folder " + testDataDir.absolutePath }
val tmpDir = FileUtil.createTempDirectory("jps-build", null) val tmpDir = FileUtil.createTempDirectory("kjbtb-jps-build", null)
FileUtil.copyDir(testDataDir, tmpDir) FileUtil.copyDir(testDataDir, tmpDir)
return tmpDir return tmpDir
} }