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

Fix after review

Browse Source
This commit is contained in:
Ilya Chernikov
2017-12-11 22:34:04 +01:00
committed by Vyacheslav Gerasimov
parent fbbece3c86
commit 05f0978865
7 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/buildLexer.xml
+1 -1
View File
@@ -34,7 +34,7 @@
</macrodef>
<target name="check-idea-flex.skeleton.exists">
<available file="${builddir}/idea-flex.skeleton" property="skjeleton.exisits"/>
<available file="${builddir}/idea-flex.skeleton" property="skeleton.exists"/>
</target>
<target name="get-idea-flex.skeleton.if.not.exists" depends="check-idea-flex.skeleton.exists" unless="skjeleton.exisits">
compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+1 -6
View File
@@ -79,7 +79,7 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir {
content = normalizePath(content, testDataDir, "[TestData]");
content = normalizePath(content, tmpdir, "[Temp]");
content = normalizePath(content, getCompilerLib(), "[CompilerLib]");
content = normalizePath(content, getKotlinProjectHome(), "[KotlinProjectHome]");
content = normalizePath(content, new File(KotlinTestUtils.getHomeDirectory()), "[KotlinProjectHome]");
content = content.replaceAll(Pattern.quote(KotlinCompilerVersion.VERSION), "[KotlinVersion]");
content = content.replaceAll("\\(JRE .+\\)", "(JRE [JREVersion])");
content = StringUtil.convertLineSeparators(content);
@@ -139,11 +139,6 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir {
return file;
}
protected static File getKotlinProjectHome() {
// assuming that tests are always run from the project's root
return new File(System.getProperty("user.dir"));
}
private static class OutputListener extends ProcessAdapter {
private final StringBuilder out;
private final StringBuilder err;