From 00e452bcdfb3fb3e5d88cc4f99a00b0640b03af1 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Mon, 27 Mar 2017 11:28:02 +0300 Subject: [PATCH] Added tests on link stage (disabled for now). --- backend.native/tests/build.gradle | 9 +++++++++ .../tests/codegen/inline/defaultArgs_linkTest_lib.kt | 3 +++ .../tests/codegen/inline/defaultArgs_linkTest_main.kt | 6 ++++++ .../main/groovy/org/jetbrains/kotlin/KonanTest.groovy | 4 ++-- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 backend.native/tests/codegen/inline/defaultArgs_linkTest_lib.kt create mode 100644 backend.native/tests/codegen/inline/defaultArgs_linkTest_main.kt diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index e37d5a72eed..6048e4d9cc0 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -1541,6 +1541,15 @@ task deserialized_listof0(type: RunKonanTest) { flags = ["--enable", "deserializer"] } +// Enable when deserialization for default arguments is fixed. +task inline_defaultArgs_linkTest(type: LinkKonanTest) { + disabled = true + goldValue = "122\n47\n" + source = "codegen/inline/defaultArgs_linkTest_main.kt" + lib = "codegen/inline/defaultArgs_linkTest_lib.kt" + flags = ["--enable", "deserializer", "--print_ir", "--verbose", "deserializer", "--verbose", "lower_inline"] +} + kotlinNativeInterop { sysstat { pkg 'sysstat' diff --git a/backend.native/tests/codegen/inline/defaultArgs_linkTest_lib.kt b/backend.native/tests/codegen/inline/defaultArgs_linkTest_lib.kt new file mode 100644 index 00000000000..04a3e5e7349 --- /dev/null +++ b/backend.native/tests/codegen/inline/defaultArgs_linkTest_lib.kt @@ -0,0 +1,3 @@ +package a + +inline fun foo(x: Int, y: Int = 117) = x + y \ No newline at end of file diff --git a/backend.native/tests/codegen/inline/defaultArgs_linkTest_main.kt b/backend.native/tests/codegen/inline/defaultArgs_linkTest_main.kt new file mode 100644 index 00000000000..19a3db05739 --- /dev/null +++ b/backend.native/tests/codegen/inline/defaultArgs_linkTest_main.kt @@ -0,0 +1,6 @@ +import a.* + +fun main(args: Array) { + println(foo(5)) + println(foo(5, 42)) +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy index 7fbd98918a0..5d9377b4201 100644 --- a/buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy +++ b/buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy @@ -249,8 +249,8 @@ class LinkKonanTest extends KonanTest { def libDir = project.file(lib).absolutePath def libBc = "${libDir}.bc" - runCompiler(lib, libBc, ['-nolink']) - runCompiler(filesToCompile, exe, ['-library', libBc]) + runCompiler(lib, libBc, ['-nolink'] + ((flags != null) ? flags :[])) + runCompiler(filesToCompile, exe, ['-library', libBc] + ((flags != null) ? flags :[])) } }