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

Rename tmpDirForReusableLibrary -> tmpDirForReusableFolder

Browse Source
This commit is contained in:
Mikhael Bogdanov
2019-04-10 12:11:27 +02:00
parent 8287e448d1
commit d806320383
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+2 -2
View File
@@ -119,7 +119,7 @@ public class KotlinTestUtils {
static { static {
try { try {
IDEA_SYSTEM_PATH = tmpDirForReusableLibrary("idea-system").getPath(); IDEA_SYSTEM_PATH = tmpDirForReusableFolder("idea-system").getPath();
} }
catch (IOException e) { catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@@ -442,7 +442,7 @@ public class KotlinTestUtils {
} }
@NotNull @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)); return normalizeFile(FileUtil.createTempDirectory(new File(System.getProperty("java.io.tmpdir")), name, "", true));
} }
compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt
+2 -2
View File
@@ -52,7 +52,7 @@ object MockLibraryUtil {
useJava9: Boolean = false useJava9: Boolean = false
): File { ): File {
return compileLibraryToJar( return compileLibraryToJar(
sourcesPath, KotlinTestUtils.tmpDirForReusableLibrary("testLibrary-" + jarName), jarName, addSources, allowKotlinSources, extraOptions, extraClasspath sourcesPath, KotlinTestUtils.tmpDirForReusableFolder("testLibrary-" + jarName), jarName, addSources, allowKotlinSources, extraOptions, extraClasspath
, useJava9)} , useJava9)}
@JvmStatic @JvmStatic
@@ -127,7 +127,7 @@ object MockLibraryUtil {
@JvmStatic @JvmStatic
fun compileJsLibraryToJar(sourcesPath: String, jarName: String, addSources: Boolean, extraOptions: List<String> = emptyList()): File { fun compileJsLibraryToJar(sourcesPath: String, jarName: String, addSources: Boolean, extraOptions: List<String> = emptyList()): File {
val contentDir = KotlinTestUtils.tmpDirForReusableLibrary("testLibrary-" + jarName) val contentDir = KotlinTestUtils.tmpDirForReusableFolder("testLibrary-" + jarName)
val outDir = File(contentDir, "out") val outDir = File(contentDir, "out")
val outputFile = File(outDir, jarName + ".js") val outputFile = File(outDir, jarName + ".js")
idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+1 -1
View File
@@ -332,7 +332,7 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
private fun compileLibToDir(srcDir: File, vararg classpath: String): File { private fun compileLibToDir(srcDir: File, vararg classpath: String): File {
//TODO: tmpDir would be enough, but there is tricky fail under AS otherwise //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) val kotlinSourceFiles = FileUtil.findFilesByMask(Pattern.compile(".+\\.kt$"), srcDir)
if (kotlinSourceFiles.isNotEmpty()) { if (kotlinSourceFiles.isNotEmpty()) {
js/js.tests/test/org/jetbrains/kotlin/js/test/interop/ScriptEngineV8.kt
+1 -1
View File
@@ -15,7 +15,7 @@ import java.io.File
class ScriptEngineV8 : ScriptEngine { class ScriptEngineV8 : ScriptEngine {
companion object { companion object {
// It's important that this is not created per test, but rather per process. // 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 <T> releaseObject(t: T) { override fun <T> releaseObject(t: T) {