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

KT-3008 Fix CLI and JPS tests related to JS translator

Browse Source
This commit is contained in:
Alexey Andreev
2016-04-25 13:40:52 +03:00
parent 2d994c1a03
commit a9ed789727
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/js/jsHelp.out
Vendored
+1
View File
@@ -19,3 +19,4 @@ where possible options include:
-X Print a synopsis of advanced options -X Print a synopsis of advanced options
-P plugin:<pluginId>:<optionName>=<value> -P plugin:<pluginId>:<optionName>=<value>
Pass an option to a plugin Pass an option to a plugin
OK
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+4 -4
View File
@@ -82,20 +82,20 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
"$PROJECT_NAME.js", "$PROJECT_NAME.js",
"$PROJECT_NAME.meta.js", "$PROJECT_NAME.meta.js",
"lib/kotlin.js", "lib/kotlin.js",
"lib/stdlib.meta.js" "lib/kotlin.meta.js"
) )
private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = hashSetOf( private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = hashSetOf(
"$ADDITIONAL_MODULE_NAME.js", "$ADDITIONAL_MODULE_NAME.js",
"$ADDITIONAL_MODULE_NAME.meta.js", "$ADDITIONAL_MODULE_NAME.meta.js",
"lib/kotlin.js", "lib/kotlin.js",
"lib/stdlib.meta.js" "lib/kotlin.meta.js"
) )
private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js") private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js")
private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = hashSetOf( private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = hashSetOf(
"$PROJECT_NAME.js", "$PROJECT_NAME.js",
"$PROJECT_NAME.meta.js", "$PROJECT_NAME.meta.js",
"lib/kotlin.js", "lib/kotlin.js",
"lib/stdlib.meta.js", "lib/kotlin.meta.js",
"lib/jslib-example.js", "lib/jslib-example.js",
"lib/file0.js", "lib/file0.js",
"lib/dir/file1.js", "lib/dir/file1.js",
@@ -107,7 +107,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
"$PROJECT_NAME.js", "$PROJECT_NAME.js",
"$PROJECT_NAME.meta.js", "$PROJECT_NAME.meta.js",
"custom/kotlin.js", "custom/kotlin.js",
"custom/stdlib.meta.js", "custom/kotlin.meta.js",
"custom/jslib-example.js", "custom/jslib-example.js",
"custom/file0.js", "custom/file0.js",
"custom/dir/file1.js", "custom/dir/file1.js",