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

Fix cli help tests

Browse Source
This commit is contained in:
Yan Zhulanow
2014-12-11 19:27:37 +03:00
parent 4b18507bf5
commit 6ab2dc90f8
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java
+3 -3
View File
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
public abstract class CommonCompilerArguments {
public static final String PLUGIN_OPTION_FORMAT = "<pluginId>:<optionName>=<value>";
public static final String PLUGIN_OPTION_FORMAT = "plugin:<pluginId>:<optionName>=<value>";
@Argument(value = "nowarn", description = "Generate no warnings")
public boolean suppressWarnings;
@@ -43,11 +43,11 @@ public abstract class CommonCompilerArguments {
@Argument(value = "Xno-inline", description = "Disable method inlining")
public boolean noInline;
@Argument(value = "Xplugin", description = "Load a plugin from the given classpath")
@Argument(value = "Xplugin", description = "Load plugins from the given classpath")
@ValueDescription("<path>")
public String[] pluginClasspaths;
@Argument(value = "P", description = "Pass an option to a plugin")
@Argument(value = "P", description = "\n Pass an option to a plugin")
@ValueDescription(PLUGIN_OPTION_FORMAT)
public String[] pluginOptions;
compiler/testData/cli/js/jsExtraHelp.out
+1
View File
@@ -1,6 +1,7 @@
Usage: kotlinc-js <options> <source files>
where advanced options include:
-Xno-inline Disable method inlining
-Xplugin <path> Load plugins from the given classpath
Advanced options are non-standard and may be changed or removed without any notice.
OK
compiler/testData/cli/js/jsHelp.out
+2
View File
@@ -13,4 +13,6 @@ where possible options include:
-version Display compiler version
-help (-h) Print a synopsis of standard options
-X Print a synopsis of advanced options
-P plugin:<pluginId>:<optionName>=<value>
Pass an option to a plugin
OK
compiler/testData/cli/jvm/extraHelp.out
+1
View File
@@ -4,6 +4,7 @@ where advanced options include:
-Xno-param-assertions Don't generate not-null assertions on parameters of methods accessible from Java
-Xno-optimize Disable optimizations
-Xno-inline Disable method inlining
-Xplugin <path> Load plugins from the given classpath
Advanced options are non-standard and may be changed or removed without any notice.
OK
compiler/testData/cli/jvm/help.out
+2 -2
View File
@@ -10,11 +10,11 @@ where possible options include:
-module <path> Path to the module file to compile
-script Evaluate the script file
-kotlin-home <path> Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-androidRes <path> Android resources path
-androidManifest <path> Android manifest file
-nowarn Generate no warnings
-verbose Enable verbose logging output
-version Display compiler version
-help (-h) Print a synopsis of standard options
-X Print a synopsis of advanced options
-P plugin:<pluginId>:<optionName>=<value>
Pass an option to a plugin
OK
compiler/testData/cli/jvm/wrongArgument.out
+2 -2
View File
@@ -11,11 +11,11 @@ where possible options include:
-module <path> Path to the module file to compile
-script Evaluate the script file
-kotlin-home <path> Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-androidRes <path> Android resources path
-androidManifest <path> Android manifest file
-nowarn Generate no warnings
-verbose Enable verbose logging output
-version Display compiler version
-help (-h) Print a synopsis of standard options
-X Print a synopsis of advanced options
-P plugin:<pluginId>:<optionName>=<value>
Pass an option to a plugin
INTERNAL_ERROR