From 74ee64fcf11c1ded435771aaa5a073a92a1173d1 Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Mon, 11 Feb 2019 12:38:58 +0300 Subject: [PATCH] [JS IR] Workaround: don't try to use generated js files for secondary modules --- .../test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index 0abadf47c7b..a8d014eeb21 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -134,14 +134,21 @@ abstract class BasicBoxTest( val friends = module.friends.map { modules[it]?.outputFileName(outputDir) + ".meta.js" } val outputFileName = module.outputFileName(outputDir) + ".js" + val isMainModule = mainModuleName == module.name generateJavaScriptFile( file.parent, module, outputFileName, dependencies, friends, modules.size > 1, !SKIP_SOURCEMAP_REMAPPING.matcher(fileContent).find(), 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)