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

Normalize files that are gotten from FileUtil.createTempDirectory

Browse Source 
It's required to avoid getting different paths inside tools (compiler, ant etc) and in tests.
This commit is contained in:
Kartik Patodi
2017-10-18 09:54:18 +05:30
committed by Zalim Bashorov
parent 5284db8088
commit dc6c19d7ef
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
+11 -4
View File
@@ -389,20 +389,27 @@ public class KotlinTestUtils {
@NotNull @NotNull
public static File tmpDirForTest(TestCase test) throws IOException { public static File tmpDirForTest(TestCase test) throws IOException {
File answer = FileUtil.createTempDirectory(test.getClass().getSimpleName(), test.getName()); File answer = normalizeFile(FileUtil.createTempDirectory(test.getClass().getSimpleName(), test.getName()));
deleteOnShutdown(answer); deleteOnShutdown(answer);
return answer; return answer;
} }
@NotNull @NotNull
public static File tmpDir(String name) throws IOException { public static File tmpDir(String name) throws IOException {
// we should use this form. otherwise directory will be deleted on each test // We should use this form. otherwise directory will be deleted on each test.
File answer = FileUtil.createTempDirectory(new File(System.getProperty("java.io.tmpdir")), name, ""); File answer = normalizeFile(FileUtil.createTempDirectory(new File(System.getProperty("java.io.tmpdir")), name, ""));
deleteOnShutdown(answer); deleteOnShutdown(answer);
return answer; return answer;
} }
public static void deleteOnShutdown(File file) { private static File normalizeFile(File file) throws IOException {
// Get canonical file to be sure that it's the same as inside the compiler,
// for example, on Windows, if a canonical path contains any space from FileUtil.createTempDirectory we will get
// a File with short names (8.3) in its path and it will break some normalization passes in tests.
return file.getCanonicalFile();
}
private static void deleteOnShutdown(File file) {
if (filesToDelete.isEmpty()) { if (filesToDelete.isEmpty()) {
ShutDownTracker.getInstance().registerShutdownTask(() -> ShutDownTracker.invokeAndWait(true, true, () -> { ShutDownTracker.getInstance().registerShutdownTask(() -> ShutDownTracker.invokeAndWait(true, true, () -> {
for (File victim : filesToDelete) { for (File victim : filesToDelete) {