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

Fix JS tests failing on Windows

Browse Source
This commit is contained in:
Alexey Andreev
2017-10-13 12:44:54 +03:00
parent e1f8bac4d5
commit e0eea15a4c
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/js/sourceMapCharEscape.test
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
// EXISTS: out.js
// CONTAINS: out.js.map, \"©∑\\n\"\n
// CONTAINS: out.js.map, \"©∑\\n\"
compiler/testData/cli/js/sourceMapEmbedSources.test
Vendored
+2 -1
View File
@@ -1,3 +1,4 @@
// EXISTS: out.js
// CONTAINS: out.js.map, "./sourceMap.kt"
// CONTAINS: out.js.map, "var log = \"\"\n\nfun foo(x: String) {
// CONTAINS: out.js.map, "var log = \"\"
// CONTAINS: out.js.map, fun foo(x: String) {
compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
+1
View File
@@ -718,6 +718,7 @@ public class KotlinTestUtils {
String moduleDependencies = matcher.group(2);
String moduleFriends = matcher.group(3);
if (moduleName != null) {
moduleName = moduleName.trim();
hasModules = true;
module = factory.createModule(moduleName, parseModuleList(moduleDependencies), parseModuleList(moduleFriends));
}
libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/verify.bsh
+2 -1
View File
@@ -1,4 +1,5 @@
source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath());
assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "\"org/jetbrains/HelloWorld.kt\"");
assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "\"package org.jetbrains\\n\\nfun bar() = \\\"OK\\\"");
assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "\"package org.jetbrains");
assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "fun bar() = \\\"OK\\\"")