Fix compiler plugin cli tests with colons in .args on Windows
This commit is contained in:
@@ -3,9 +3,9 @@ $TEMP_DIR$
|
||||
-Xplugin
|
||||
dist/kotlinc/lib/android-compiler-plugin.jar
|
||||
-P
|
||||
plugin:org.jetbrains.kotlin.android:androidManifest=$TESTDATA_DIR$/androidPlugin/AndroidManifest.xml
|
||||
plugin\:org.jetbrains.kotlin.android\:androidManifest=$TESTDATA_DIR$/androidPlugin/AndroidManifest.xml
|
||||
-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$/androidPlugin/androidApp.kt
|
||||
$TESTDATA_DIR$/androidPlugin/androidView.kt
|
||||
|
||||
@@ -3,7 +3,7 @@ $TEMP_DIR$
|
||||
-Xplugin
|
||||
dist/kotlinc/lib/android-compiler-plugin.jar
|
||||
-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$/androidPlugin/androidApp.kt
|
||||
$TESTDATA_DIR$/androidPlugin/androidView.kt
|
||||
|
||||
@@ -100,8 +100,13 @@ public class CliBaseTest {
|
||||
if (arg.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
return arg
|
||||
// Do not replace : after \ (used in compiler plugin tests)
|
||||
String argsWithColonsReplaced = arg
|
||||
.replace("\\:", "$COLON$")
|
||||
.replace(":", File.pathSeparator)
|
||||
.replace("$COLON$", ":");
|
||||
|
||||
return argsWithColonsReplaced
|
||||
.replace("$TEMP_DIR$", tempDir)
|
||||
.replace("$TESTDATA_DIR$", testDataDir);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user