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

[JS] Respect SKIP_DCE_DRIVEN in tests

Browse Source
This commit is contained in:
Igor Chevdar
2020-02-14 18:31:54 +03:00
parent 9bc7a43991
commit 297d296b62
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+10 -6
View File
@@ -126,6 +126,8 @@ abstract class BasicBoxTest(
val inferMainModule = INFER_MAIN_MODULE.matcher(fileContent).find() val inferMainModule = INFER_MAIN_MODULE.matcher(fileContent).find()
val klibBasedMpp = KLIB_BASED_MPP.matcher(fileContent).find() val klibBasedMpp = KLIB_BASED_MPP.matcher(fileContent).find()
val skipDceDriven = SKIP_DCE_DRIVEN.matcher(fileContent).find()
TestFileFactoryImpl(coroutinesPackage).use { testFactory -> TestFileFactoryImpl(coroutinesPackage).use { testFactory ->
val inputFiles = TestFiles.createTestFiles( val inputFiles = TestFiles.createTestFiles(
file.name, file.name,
@@ -169,7 +171,7 @@ abstract class BasicBoxTest(
testFactory.tmpDir, testFactory.tmpDir,
file.parent, module, outputFileName, dceOutputFileName, pirOutputFileName, dependencies, allDependencies, friends, modules.size > 1, file.parent, module, outputFileName, dceOutputFileName, pirOutputFileName, dependencies, allDependencies, friends, modules.size > 1,
!SKIP_SOURCEMAP_REMAPPING.matcher(fileContent).find(), outputPrefixFile, outputPostfixFile, !SKIP_SOURCEMAP_REMAPPING.matcher(fileContent).find(), outputPrefixFile, outputPostfixFile,
actualMainCallParameters, testPackage, testFunction, needsFullIrRuntime, isMainModule, klibBasedMpp actualMainCallParameters, testPackage, testFunction, needsFullIrRuntime, isMainModule, klibBasedMpp, skipDceDriven
) )
when { when {
@@ -247,7 +249,7 @@ abstract class BasicBoxTest(
} }
} }
if (runIrPir && !SKIP_DCE_DRIVEN.matcher(fileContent).find()) { if (runIrPir && !skipDceDriven) {
runGeneratedCode(pirAllJsFiles, testModuleName, testPackage, testFunction, expectedResult, withModuleSystem) runGeneratedCode(pirAllJsFiles, testModuleName, testPackage, testFunction, expectedResult, withModuleSystem)
} }
} }
@@ -381,7 +383,8 @@ abstract class BasicBoxTest(
testFunction: String, testFunction: String,
needsFullIrRuntime: Boolean, needsFullIrRuntime: Boolean,
isMainModule: Boolean, isMainModule: Boolean,
klibBasedMpp: Boolean klibBasedMpp: Boolean,
skipDceDriven: Boolean
) { ) {
val kotlinFiles = module.files.filter { it.fileName.endsWith(".kt") } val kotlinFiles = module.files.filter { it.fileName.endsWith(".kt") }
val testFiles = kotlinFiles.map { it.fileName } val testFiles = kotlinFiles.map { it.fileName }
@@ -405,7 +408,7 @@ abstract class BasicBoxTest(
val incrementalData = IncrementalData() val incrementalData = IncrementalData()
translateFiles( translateFiles(
psiFiles.map(TranslationUnit::SourceFile), outputFile, dceOutputFile, pirOutputFile, config, outputPrefixFile, outputPostfixFile, psiFiles.map(TranslationUnit::SourceFile), outputFile, dceOutputFile, pirOutputFile, config, outputPrefixFile, outputPostfixFile,
mainCallParameters, incrementalData, remap, testPackage, testFunction, needsFullIrRuntime, isMainModule mainCallParameters, incrementalData, remap, testPackage, testFunction, needsFullIrRuntime, isMainModule, skipDceDriven
) )
if (incrementalCompilationChecksEnabled && module.hasFilesToRecompile) { if (incrementalCompilationChecksEnabled && module.hasFilesToRecompile) {
@@ -457,7 +460,7 @@ abstract class BasicBoxTest(
translateFiles( translateFiles(
translationUnits, recompiledOutputFile, recompiledOutputFile, recompiledOutputFile, recompiledConfig, outputPrefixFile, outputPostfixFile, translationUnits, recompiledOutputFile, recompiledOutputFile, recompiledOutputFile, recompiledConfig, outputPrefixFile, outputPostfixFile,
mainCallParameters, incrementalData, remap, testPackage, testFunction, needsFullIrRuntime, false mainCallParameters, incrementalData, remap, testPackage, testFunction, needsFullIrRuntime, false, true
) )
val originalOutput = FileUtil.loadFile(outputFile) val originalOutput = FileUtil.loadFile(outputFile)
@@ -529,7 +532,8 @@ abstract class BasicBoxTest(
testPackage: String?, testPackage: String?,
testFunction: String, testFunction: String,
needsFullIrRuntime: Boolean, needsFullIrRuntime: Boolean,
isMainModule: Boolean isMainModule: Boolean,
skipDceDriven: Boolean
) { ) {
val translator = K2JSTranslator(config, false) val translator = K2JSTranslator(config, false)
val translationResult = translator.translateUnits(ExceptionThrowingReporter, units, mainCallParameters) val translationResult = translator.translateUnits(ExceptionThrowingReporter, units, mainCallParameters)
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
+3 -2
View File
@@ -79,7 +79,8 @@ abstract class BasicIrBoxTest(
testPackage: String?, testPackage: String?,
testFunction: String, testFunction: String,
needsFullIrRuntime: Boolean, needsFullIrRuntime: Boolean,
isMainModule: Boolean isMainModule: Boolean,
skipDceDriven: Boolean
) { ) {
val filesToCompile = units val filesToCompile = units
.map { (it as TranslationUnit.SourceFile).file } .map { (it as TranslationUnit.SourceFile).file }
@@ -149,7 +150,7 @@ abstract class BasicIrBoxTest(
} }
} }
if (runIrPir) { if (runIrPir && !skipDceDriven) {
compile( compile(
project = config.project, project = config.project,
mainModule = MainModule.SourceFiles(filesToCompile), mainModule = MainModule.SourceFiles(filesToCompile),