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

Support friend modules in external tests

Browse Source
This commit is contained in:
Pavel Punegov
2020-09-14 23:12:17 +03:00
committed by Pavel Punegov
parent 90d4246d22
commit 269f6f5493
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+13 -4
View File
@@ -514,9 +514,13 @@ fun runTest() {
if (!module.isDefaultModule()) { if (!module.isDefaultModule()) {
def klibModulePath = "${executablePath()}.${module.name}.klib" def klibModulePath = "${executablePath()}.${module.name}.klib"
libs.addAll(module.dependencies) libs.addAll(module.dependencies)
def klibs = libs.collectMany { ["-l", "${executablePath()}.${it}.klib"] }.toList()
def friends = module.friends ?
module.friends.collectMany {
["-friend-modules", "${executablePath()}.${it}.klib"]
}.toList() : []
runCompiler(compileList.findAll { it.module == module }.collect { it.path }, runCompiler(compileList.findAll { it.module == module }.collect { it.path },
klibModulePath, flags + ["-p", "library"] + klibModulePath, flags + ["-p", "library"] + klibs + friends)
libs.collectMany { ["-l", "${executablePath()}.${it}.klib"] }.toList())
} }
} }
@@ -526,8 +530,13 @@ fun runTest() {
compileMain.forEach { f -> compileMain.forEach { f ->
libs.addAll(f.module.dependencies) libs.addAll(f.module.dependencies)
} }
if (!compileMain.empty) runCompiler(compileMain.collect { it.path }, executablePath(), def friends = compileMain.collectMany {it.module.friends }.toSet()
flags + libs.collectMany { ["-l", "${executablePath()}.${it}.klib"] }.toList()) if (!compileMain.empty) {
runCompiler(compileMain.collect { it.path }, executablePath(), flags +
libs.collectMany { ["-l", "${executablePath()}.${it}.klib"] }.toList() +
friends.collectMany {["-friend-modules", "${executablePath()}.${it}.klib"]}.toList()
)
}
} }
} catch (Exception ex) { } catch (Exception ex) {
project.logger.quiet("ERROR: Compilation failed for test suite: $name with exception", ex) project.logger.quiet("ERROR: Compilation failed for test suite: $name with exception", ex)