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

Fix compiler plugin cli tests with colons in .args on Windows

Browse Source
This commit is contained in:
Yan Zhulanow
2015-03-15 03:33:36 +03:00
parent 7955504089
commit b0125a3626
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/pluginSimple.args
+2 -2
View File
@@ -3,9 +3,9 @@ $TEMP_DIR$
-Xplugin -Xplugin
dist/kotlinc/lib/android-compiler-plugin.jar dist/kotlinc/lib/android-compiler-plugin.jar
-P -P
plugin:org.jetbrains.kotlin.android:androidManifest=$TESTDATA_DIR$/androidPlugin/AndroidManifest.xml plugin\:org.jetbrains.kotlin.android\:androidManifest=$TESTDATA_DIR$/androidPlugin/AndroidManifest.xml
-P -P
plugin:org.jetbrains.kotlin.android:androidRes=$TESTDATA_DIR$/androidPlugin/res plugin\:org.jetbrains.kotlin.android\:androidRes=$TESTDATA_DIR$/androidPlugin/res
$TESTDATA_DIR$/pluginSimple.kt $TESTDATA_DIR$/pluginSimple.kt
$TESTDATA_DIR$/androidPlugin/androidApp.kt $TESTDATA_DIR$/androidPlugin/androidApp.kt
$TESTDATA_DIR$/androidPlugin/androidView.kt $TESTDATA_DIR$/androidPlugin/androidView.kt
compiler/testData/cli/jvm/pluginSimpleUsage.args
+1 -1
View File
@@ -3,7 +3,7 @@ $TEMP_DIR$
-Xplugin -Xplugin
dist/kotlinc/lib/android-compiler-plugin.jar dist/kotlinc/lib/android-compiler-plugin.jar
-P -P
plugin:org.jetbrains.kotlin.android:androidManifest=$TESTDATA_DIR$/androidPlugin/AndroidManifest.xml plugin\:org.jetbrains.kotlin.android\:androidManifest=$TESTDATA_DIR$/androidPlugin/AndroidManifest.xml
$TESTDATA_DIR$/pluginSimple.kt $TESTDATA_DIR$/pluginSimple.kt
$TESTDATA_DIR$/androidPlugin/androidApp.kt $TESTDATA_DIR$/androidPlugin/androidApp.kt
$TESTDATA_DIR$/androidPlugin/androidView.kt $TESTDATA_DIR$/androidPlugin/androidView.kt
compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java
+6 -1
View File
@@ -100,8 +100,13 @@ public class CliBaseTest {
if (arg.isEmpty()) { if (arg.isEmpty()) {
return null; return null;
} }
return arg // Do not replace : after \ (used in compiler plugin tests)
String argsWithColonsReplaced = arg
.replace("\\:", "$COLON$")
.replace(":", File.pathSeparator) .replace(":", File.pathSeparator)
.replace("$COLON$", ":");
return argsWithColonsReplaced
.replace("$TEMP_DIR$", tempDir) .replace("$TEMP_DIR$", tempDir)
.replace("$TESTDATA_DIR$", testDataDir); .replace("$TESTDATA_DIR$", testDataDir);
} }