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

[JS IR] Workaround: don't try to use generated js files for secondary modules

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2019-02-11 12:38:58 +03:00
parent cfde97a7a0
commit 74ee64fcf1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+9 -2
View File
@@ -134,14 +134,21 @@ abstract class BasicBoxTest(
val friends = module.friends.map { modules[it]?.outputFileName(outputDir) + ".meta.js" } val friends = module.friends.map { modules[it]?.outputFileName(outputDir) + ".meta.js" }
val outputFileName = module.outputFileName(outputDir) + ".js" val outputFileName = module.outputFileName(outputDir) + ".js"
val isMainModule = mainModuleName == module.name
generateJavaScriptFile( generateJavaScriptFile(
file.parent, module, outputFileName, dependencies, friends, modules.size > 1, file.parent, module, outputFileName, dependencies, friends, modules.size > 1,
!SKIP_SOURCEMAP_REMAPPING.matcher(fileContent).find(), !SKIP_SOURCEMAP_REMAPPING.matcher(fileContent).find(),
outputPrefixFile, outputPostfixFile, actualMainCallParameters, testPackage, testFunction, outputPrefixFile, outputPostfixFile, actualMainCallParameters, testPackage, testFunction,
runtimeType, isMainModule = (mainModuleName == module.name) runtimeType, isMainModule
) )
if (!module.name.endsWith(OLD_MODULE_SUFFIX)) Pair(outputFileName, module) else null when {
module.name.endsWith(OLD_MODULE_SUFFIX) -> null
// JS_IR generates single js file for all modules (apart from runtime).
// TODO: Split and refactor test runner for JS_IR
targetBackend == TargetBackend.JS_IR && !isMainModule -> null
else -> Pair(outputFileName, module)
}
} }
val globalCommonFiles = JsTestUtils.getFilesInDirectoryByExtension(COMMON_FILES_DIR_PATH, JavaScript.EXTENSION) val globalCommonFiles = JsTestUtils.getFilesInDirectoryByExtension(COMMON_FILES_DIR_PATH, JavaScript.EXTENSION)