From 2d8bdcbc9b98e1af6f9a06857f406c687f212fd7 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 3 Dec 2020 19:42:56 +0300 Subject: [PATCH] Minor: use unique temp directories in jps-build tests --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 +- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 | 2 +- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index ae59ed0dab8..e5144af90b6 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -300,7 +300,7 @@ abstract class AbstractIncrementalJpsTest( protected open fun doTest(testDataPath: String) { 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) Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) }) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 index 7da9b6c9102..53c501a11f0 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 @@ -301,7 +301,7 @@ abstract class AbstractIncrementalJpsTest( protected open fun doTest(testDataPath: String) { 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) Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) }) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt index 05e2fa1ec51..eae51a0d386 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt @@ -33,7 +33,7 @@ abstract class KotlinJpsBuildTestBase : AbstractKotlinJpsBuildTestCase() { protected open fun copyTestDataToTmpDir(testDataDir: File): File { 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) return tmpDir }