From 030809e3b17b51ce26509f941770858e61b403f6 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 19 Apr 2017 22:31:51 +0300 Subject: [PATCH] KJS: add generateNodeJsRunner flag to BasicBoxTest to control the generating files for node.js runner --- .../test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt | 5 +++-- .../js/test/semantics/abstractClassesForGeneratedTests.kt | 3 ++- 2 files changed, 5 insertions(+), 3 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 505cac8354b..96b2b7e59d5 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 @@ -63,7 +63,8 @@ abstract class BasicBoxTest( private val pathToTestDir: String, private val pathToOutputDir: String, private val typedArraysEnabled: Boolean = false, - private val generateSourceMap: Boolean = false + private val generateSourceMap: Boolean = false, + private val generateNodeJsRunner: Boolean = true ) : KotlinTestWithEnvironment() { val additionalCommonFileDirectories = mutableListOf() @@ -129,7 +130,7 @@ abstract class BasicBoxTest( val allJsFiles = additionalFiles + inputJsFiles + generatedJsFiles + globalCommonFiles + localCommonFiles + additionalCommonFiles - if (!SKIP_NODE_JS.matcher(expectedText).find()) { + if (generateNodeJsRunner && !SKIP_NODE_JS.matcher(expectedText).find()) { val nodeRunnerName = mainModule.outputFileName(outputDir) + ".node.js" val ignored = InTextDirectivesUtils.isIgnoredTarget(TargetBackend.JS, file) val nodeRunnerText = generateNodeRunner(allJsFiles, outputDir, mainModuleName, ignored, testFactory.testPackage) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt index fabe068ebca..ecf1d3aa521 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt @@ -56,5 +56,6 @@ abstract class AbstractJsTypedArraysBoxTest : BasicBoxTest( abstract class AbstractSourceMapGenerationSmokeTest : BasicBoxTest( BasicBoxTest.TEST_DATA_DIR_PATH + "sourcemap/", "${BasicBoxTest.TEST_DATA_DIR_PATH}/out/sourcemap/", - generateSourceMap = true + generateSourceMap = true, + generateNodeJsRunner = false ) \ No newline at end of file