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

unit-tests: Allow user to set a custom entry point for test program

Browse Source
This commit is contained in:
Ilya Matveev
2017-09-25 17:39:25 +03:00
committed by ilmat192
parent 7c906b74fc
commit d5fe0862ac
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/EntryPoint.kt
+2 -12
View File
@@ -38,18 +38,8 @@ internal fun findMainEntryPoint(context: Context): FunctionDescriptor? {
val config = context.config.configuration val config = context.config.configuration
if (config.get(KonanConfigKeys.PRODUCE) != CompilerOutputKind.PROGRAM) return null if (config.get(KonanConfigKeys.PRODUCE) != CompilerOutputKind.PROGRAM) return null
val userEntryName = config.get(KonanConfigKeys.ENTRY) val entryPoint = FqName(config.get(KonanConfigKeys.ENTRY) ?:
val entryPoint: FqName if (context.shouldGenerateTestRunner()) testEntryName else defaultEntryName)
if (config.getBoolean(KonanConfigKeys.GENERATE_TEST_RUNNER)) {
entryPoint = FqName(testEntryName)
if (userEntryName != null) {
config.report(CompilerMessageSeverity.WARNING,
"Custom entry point is ignored if test runner is generated"
)
}
} else {
entryPoint = FqName(userEntryName ?: defaultEntryName)
}
val entryName = entryPoint.shortName() val entryName = entryPoint.shortName()
val packageName = entryPoint.parent() val packageName = entryPoint.parent()