From b0125a3626b0e2e88aba1e94cf531e92f06e8bad Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Sun, 15 Mar 2015 03:33:36 +0300 Subject: [PATCH] Fix compiler plugin cli tests with colons in .args on Windows --- compiler/testData/cli/jvm/pluginSimple.args | 4 ++-- compiler/testData/cli/jvm/pluginSimpleUsage.args | 2 +- compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/compiler/testData/cli/jvm/pluginSimple.args b/compiler/testData/cli/jvm/pluginSimple.args index 146f285fac8..43e20ac9e94 100644 --- a/compiler/testData/cli/jvm/pluginSimple.args +++ b/compiler/testData/cli/jvm/pluginSimple.args @@ -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 diff --git a/compiler/testData/cli/jvm/pluginSimpleUsage.args b/compiler/testData/cli/jvm/pluginSimpleUsage.args index 0685954258a..5c4711fd65a 100644 --- a/compiler/testData/cli/jvm/pluginSimpleUsage.args +++ b/compiler/testData/cli/jvm/pluginSimpleUsage.args @@ -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 diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java index a0fbd5aca4b..05cd5462880 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java @@ -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); }