diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index 20bcf63aba0..d42a2739cb5 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -119,7 +119,7 @@ public class KotlinTestUtils { static { try { - IDEA_SYSTEM_PATH = tmpDirForReusableLibrary("idea-system").getPath(); + IDEA_SYSTEM_PATH = tmpDirForReusableFolder("idea-system").getPath(); } catch (IOException e) { throw new RuntimeException(e); @@ -442,7 +442,7 @@ public class KotlinTestUtils { } @NotNull - public static File tmpDirForReusableLibrary(String name) throws IOException { + public static File tmpDirForReusableFolder(String name) throws IOException { return normalizeFile(FileUtil.createTempDirectory(new File(System.getProperty("java.io.tmpdir")), name, "", true)); } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt index 2d64751e741..d5c57b4bfa5 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt @@ -52,7 +52,7 @@ object MockLibraryUtil { useJava9: Boolean = false ): File { return compileLibraryToJar( - sourcesPath, KotlinTestUtils.tmpDirForReusableLibrary("testLibrary-" + jarName), jarName, addSources, allowKotlinSources, extraOptions, extraClasspath + sourcesPath, KotlinTestUtils.tmpDirForReusableFolder("testLibrary-" + jarName), jarName, addSources, allowKotlinSources, extraOptions, extraClasspath , useJava9)} @JvmStatic @@ -127,7 +127,7 @@ object MockLibraryUtil { @JvmStatic fun compileJsLibraryToJar(sourcesPath: String, jarName: String, addSources: Boolean, extraOptions: List = emptyList()): File { - val contentDir = KotlinTestUtils.tmpDirForReusableLibrary("testLibrary-" + jarName) + val contentDir = KotlinTestUtils.tmpDirForReusableFolder("testLibrary-" + jarName) val outDir = File(contentDir, "out") val outputFile = File(outDir, jarName + ".js") diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt index e76a5965bdc..24dc18d65a1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt @@ -332,7 +332,7 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() { private fun compileLibToDir(srcDir: File, vararg classpath: String): File { //TODO: tmpDir would be enough, but there is tricky fail under AS otherwise - val outDir = KotlinTestUtils.tmpDirForReusableLibrary("${getTestName(false)}${srcDir.name}Out") + val outDir = KotlinTestUtils.tmpDirForReusableFolder("${getTestName(false)}${srcDir.name}Out") val kotlinSourceFiles = FileUtil.findFilesByMask(Pattern.compile(".+\\.kt$"), srcDir) if (kotlinSourceFiles.isNotEmpty()) { diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/interop/ScriptEngineV8.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/interop/ScriptEngineV8.kt index 22297dbc830..b8ddc213bf1 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/interop/ScriptEngineV8.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/interop/ScriptEngineV8.kt @@ -15,7 +15,7 @@ import java.io.File class ScriptEngineV8 : ScriptEngine { companion object { // It's important that this is not created per test, but rather per process. - val LIBRARY_PATH_BASE = KotlinTestUtils.tmpDirForReusableLibrary("j2v8_library_path").path + val LIBRARY_PATH_BASE = KotlinTestUtils.tmpDirForReusableFolder("j2v8_library_path").path } override fun releaseObject(t: T) {