From 28b60d7e619c83054969923a385e9f3345e6a55b Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Thu, 17 Feb 2022 16:52:20 +0100 Subject: [PATCH] Add another flavor to android tests --- compiler/android-tests/android-module/build.gradle | 4 ++++ .../kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt | 2 +- .../box/inlineClasses/kt26103_contravariantUnderlyingType.kt | 1 + .../box/inlineClasses/kt26103_covariantUnderlyingType.kt | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/android-tests/android-module/build.gradle b/compiler/android-tests/android-module/build.gradle index 4c31e3efaf1..7f4d024dc09 100644 --- a/compiler/android-tests/android-module/build.gradle +++ b/compiler/android-tests/android-module/build.gradle @@ -69,6 +69,10 @@ android { dimension "box" } + common3 { + dimension "box" + } + reflect0 { dimension "box" } diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt index 5cbf8842700..06cfa077500 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt @@ -59,7 +59,7 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager //keep it globally to avoid test grouping on TC private val generatedTestNames = hashSetOf() - private val COMMON = FlavorConfig(TargetBackend.ANDROID,"common", 3) + private val COMMON = FlavorConfig(TargetBackend.ANDROID,"common", 4) private val REFLECT = FlavorConfig(TargetBackend.ANDROID, "reflect", 1) private val COMMON_IR = FlavorConfig(TargetBackend.ANDROID_IR, "common_ir", 4) diff --git a/compiler/testData/codegen/box/inlineClasses/kt26103_contravariantUnderlyingType.kt b/compiler/testData/codegen/box/inlineClasses/kt26103_contravariantUnderlyingType.kt index 438764b0a1b..915f04b7c3c 100644 --- a/compiler/testData/codegen/box/inlineClasses/kt26103_contravariantUnderlyingType.kt +++ b/compiler/testData/codegen/box/inlineClasses/kt26103_contravariantUnderlyingType.kt @@ -1,5 +1,6 @@ // WITH_STDLIB // WORKS_WHEN_VALUE_CLASS +// IGNORE_BACKEND: ANDROID // LANGUAGE: +ValueClasses OPTIONAL_JVM_INLINE_ANNOTATION diff --git a/compiler/testData/codegen/box/inlineClasses/kt26103_covariantUnderlyingType.kt b/compiler/testData/codegen/box/inlineClasses/kt26103_covariantUnderlyingType.kt index 60edb735944..26a25731bd2 100644 --- a/compiler/testData/codegen/box/inlineClasses/kt26103_covariantUnderlyingType.kt +++ b/compiler/testData/codegen/box/inlineClasses/kt26103_covariantUnderlyingType.kt @@ -1,5 +1,6 @@ // WITH_STDLIB // WORKS_WHEN_VALUE_CLASS +// IGNORE_BACKEND: ANDROID // LANGUAGE: +ValueClasses OPTIONAL_JVM_INLINE_ANNOTATION