From d5fe0862aca7f1697b16c8ec4412117df944506c Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Mon, 25 Sep 2017 17:39:25 +0300 Subject: [PATCH] unit-tests: Allow user to set a custom entry point for test program --- .../kotlin/backend/konan/llvm/EntryPoint.kt | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/EntryPoint.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/EntryPoint.kt index 12b7c306bd6..066887e1d37 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/EntryPoint.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/EntryPoint.kt @@ -38,18 +38,8 @@ internal fun findMainEntryPoint(context: Context): FunctionDescriptor? { val config = context.config.configuration if (config.get(KonanConfigKeys.PRODUCE) != CompilerOutputKind.PROGRAM) return null - val userEntryName = config.get(KonanConfigKeys.ENTRY) - val entryPoint: FqName - 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 entryPoint = FqName(config.get(KonanConfigKeys.ENTRY) ?: + if (context.shouldGenerateTestRunner()) testEntryName else defaultEntryName) val entryName = entryPoint.shortName() val packageName = entryPoint.parent()