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

Minor. Fix AS32 compilation

Browse Source
This commit is contained in:
Mikhael Bogdanov
2019-04-10 21:16:42 +02:00
parent b24690b35b
commit 3d1b6fb83c
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
+21 -1
View File
@@ -90,6 +90,8 @@ import java.util.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static com.intellij.openapi.application.PathManager.PROPERTY_CONFIG_PATH;
import static com.intellij.openapi.application.PathManager.PROPERTY_SYSTEM_PATH;
import static org.jetbrains.kotlin.test.InTextDirectivesUtils.*; import static org.jetbrains.kotlin.test.InTextDirectivesUtils.*;
public class KotlinTestUtils { public class KotlinTestUtils {
@@ -109,6 +111,19 @@ public class KotlinTestUtils {
private static final List<File> filesToDelete = new ArrayList<>(); private static final List<File> filesToDelete = new ArrayList<>();
// It's important that this is not created per test, but rather per process.
public static final String IDEA_SYSTEM_PATH;
static {
try {
IDEA_SYSTEM_PATH = tmpDirForReusableFolder("idea-system").getPath();
}
catch (IOException e) {
throw new RuntimeException(e);
}
}
/** /**
* Syntax: * Syntax:
* *
@@ -424,7 +439,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));
} }
@@ -1272,4 +1287,9 @@ public class KotlinTestUtils {
// Several extension if name contains another dot // Several extension if name contains another dot
return name.indexOf('.', firstDotIndex + 1) != -1; return name.indexOf('.', firstDotIndex + 1) != -1;
} }
public static void setIdeaSystemPathProperties() {
System.setProperty(PROPERTY_SYSTEM_PATH, IDEA_SYSTEM_PATH);
System.setProperty(PROPERTY_CONFIG_PATH, IDEA_SYSTEM_PATH + "/config");
}
} }