From 1a4b9990520e645bde5dce85500e0bd4d4d058e4 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 20 Jan 2020 17:22:22 +0100 Subject: [PATCH] test:compilation: make test compilable with 1.4 enum_equals, switchLowering -XXLanguage:-ProhibitComparisonOfIncompatibleEnums tailrec: -XXLanguage:-ProhibitTailrecOnVirtualMember --- backend.native/tests/build.gradle | 9 ++++++--- backend.native/tests/codegen/enum/switchLowering.kt | 2 +- backend.native/tests/lower/tailrec.kt | 3 +-- backend.native/tests/runtime/basic/enum_equals.kt | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index b7f080ecaae..4ade767ad71 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -802,9 +802,10 @@ task hello4(type: KonanLocalTest) { source = "runtime/basic/hello4.kt" } -task enumEquals(type: KonanLocalTest) { +standaloneTest('enumEquals') { goldValue = "true\nfalse\nfalse\n" source = "runtime/basic/enum_equals.kt" + flags = ['-XXLanguage:-ProhibitComparisonOfIncompatibleEnums', '-e', 'runtime.basic.enum_equals.main'] } standaloneTest("entry0") { @@ -1123,9 +1124,10 @@ task enum_reorderedArguments(type: KonanLocalTest) { source = "codegen/enum/reorderedArguments.kt" } -task switchLowering(type: KonanLocalTest) { +standaloneTest('switchLowering') { goldValue = "EnumA.A\nok\nok\nok\nok\nok\n" source = "codegen/enum/switchLowering.kt" + flags = ['-XXLanguage:-ProhibitComparisonOfIncompatibleEnums', '-e', 'codegen.enum.switchLowering.main'] } task enum_lambdaInDefault(type: KonanLocalTest) { @@ -2797,7 +2799,7 @@ task vararg_of_literals(type: KonanLocalTest) { source = "lower/vararg_of_literals.kt" } -task tailrec(type: KonanLocalTest) { +standaloneTest('tailrec') { goldValue = "12\n100000000\n" + "8\n" + "1\n" + @@ -2807,6 +2809,7 @@ task tailrec(type: KonanLocalTest) { "default\n" + "42\n" source = "lower/tailrec.kt" + flags = ['-XXLanguage:-ProhibitTailrecOnVirtualMember', '-e', 'lower.tailrec.main'] } task inline1(type: KonanLocalTest) { diff --git a/backend.native/tests/codegen/enum/switchLowering.kt b/backend.native/tests/codegen/enum/switchLowering.kt index 046cf6f8500..8db7d17328f 100644 --- a/backend.native/tests/codegen/enum/switchLowering.kt +++ b/backend.native/tests/codegen/enum/switchLowering.kt @@ -81,7 +81,7 @@ fun nestedWhen() { }) } -@Test fun runTest() { +fun main() { differentEnums() nullable() operatorOverloading() diff --git a/backend.native/tests/lower/tailrec.kt b/backend.native/tests/lower/tailrec.kt index a9e8dfef1ac..bd8194474b7 100644 --- a/backend.native/tests/lower/tailrec.kt +++ b/backend.native/tests/lower/tailrec.kt @@ -5,9 +5,8 @@ package lower.tailrec -import kotlin.test.* -@Test fun runTest() { +fun main() { println(add(5, 7)) println(add(100000000, 0)) diff --git a/backend.native/tests/runtime/basic/enum_equals.kt b/backend.native/tests/runtime/basic/enum_equals.kt index 8d179c42b29..b5db82a51b9 100644 --- a/backend.native/tests/runtime/basic/enum_equals.kt +++ b/backend.native/tests/runtime/basic/enum_equals.kt @@ -15,7 +15,7 @@ enum class EnumB { B } -@Test fun run() { +fun main() { println(EnumA.A == EnumA.A) println(EnumA.A == EnumA.B) println(EnumA.A == EnumB.B)