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

[JS IR] fix IC pipeline and unmute tests

Browse Source
This commit is contained in:
Anton Bannykh
2021-11-24 23:04:38 +03:00
committed by TeamCityServer
parent 3be44a3540
commit d74ab1538b
8 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
+2 -2
View File
@@ -194,9 +194,9 @@ class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigu
return files.any { JsEnvironmentConfigurationDirectives.RECOMPILE in it.directives } return files.any { JsEnvironmentConfigurationDirectives.RECOMPILE in it.directives }
} }
fun incrementalEnabledFor(module: TestModule, testServices: TestServices): Boolean { fun incrementalEnabled(testServices: TestServices): Boolean {
return JsEnvironmentConfigurationDirectives.SKIP_IR_INCREMENTAL_CHECKS !in testServices.moduleStructure.allDirectives && return JsEnvironmentConfigurationDirectives.SKIP_IR_INCREMENTAL_CHECKS !in testServices.moduleStructure.allDirectives &&
module.hasFilesToRecompile() testServices.moduleStructure.modules.any { it.hasFilesToRecompile() }
} }
} }
js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt
+1 -1
View File
@@ -88,7 +88,7 @@ class JsIrBackendFacade(
if (skipRegularMode) return null if (skipRegularMode) return null
if (JsEnvironmentConfigurator.incrementalEnabledFor(module, testServices)) { if (JsEnvironmentConfigurator.incrementalEnabled(testServices)) {
val outputFile = if (firstTimeCompilation) { val outputFile = if (firstTimeCompilation) {
File(JsEnvironmentConfigurator.getJsModuleArtifactPath(testServices, module.name) + ".js") File(JsEnvironmentConfigurator.getJsModuleArtifactPath(testServices, module.name) + ".js")
} else { } else {
js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt
+1 -1
View File
@@ -90,7 +90,7 @@ class JsKlibBackendFacade(
moduleDescriptor.setDependencies(dependencies + moduleDescriptor) moduleDescriptor.setDependencies(dependencies + moduleDescriptor)
testServices.moduleDescriptorProvider.replaceModuleDescriptorForModule(module, moduleDescriptor) testServices.moduleDescriptorProvider.replaceModuleDescriptorForModule(module, moduleDescriptor)
if (JsEnvironmentConfigurator.incrementalEnabledFor(module, testServices)) { if (JsEnvironmentConfigurator.incrementalEnabled(testServices)) {
testServices.jsIrIncrementalDataProvider.recordIncrementalData(module, lib) testServices.jsIrIncrementalDataProvider.recordIncrementalData(module, lib)
} }
testServices.jsLibraryProvider.setDescriptorAndLibraryByName(outputFile, moduleDescriptor, lib) testServices.jsLibraryProvider.setDescriptorAndLibraryByName(outputFile, moduleDescriptor, lib)
js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/CommonRecompileModuleJsBackendFacade.kt
+1 -1
View File
@@ -78,6 +78,6 @@ abstract class CommonRecompileModuleJsBackendFacade<R : ResultingArtifact.Fronte
} }
override fun shouldRunAnalysis(module: TestModule): Boolean { override fun shouldRunAnalysis(module: TestModule): Boolean {
return module.targetBackend == backendKind && JsEnvironmentConfigurator.incrementalEnabledFor(module, testServices) return module.targetBackend == backendKind && JsEnvironmentConfigurator.run { incrementalEnabled(testServices) && module.hasFilesToRecompile()}
} }
} }
js/js.translator/testData/box/incremental/inlineModuleVariable.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// SKIP_IR_INCREMENTAL_CHECKS
// EXPECTED_REACHABLE_NODES: 1282 // EXPECTED_REACHABLE_NODES: 1282
// MODULE: lib // MODULE: lib
// FILE: lib.kt // FILE: lib.kt
js/js.translator/testData/box/incremental/multipleReimport.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// SKIP_IR_INCREMENTAL_CHECKS
// EXPECTED_REACHABLE_NODES: 1286 // EXPECTED_REACHABLE_NODES: 1286
// MODULE: lib1 // MODULE: lib1
// FILE: lib1.kt // FILE: lib1.kt
js/js.translator/testData/box/inlineMultiModule/inlineableAliasForExternalDeclaration.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// SKIP_IR_INCREMENTAL_CHECKS
// EXPECTED_REACHABLE_NODES: 1282 // EXPECTED_REACHABLE_NODES: 1282
// MODULE: lib // MODULE: lib
// FILE: lib.kt // FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/repeatedImport.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// SKIP_IR_INCREMENTAL_CHECKS
// EXPECTED_REACHABLE_NODES: 1284 // EXPECTED_REACHABLE_NODES: 1284
// MODULE: lib // MODULE: lib
// FILE: lib.kt // FILE: lib.kt