From 0ad24f5346088580e14e362cedb8874dae953028 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Thu, 28 Jan 2021 17:18:06 +0100
Subject: [PATCH] Enable Android box test

---
 .../org/jetbrains/kotlin/android/tests/AndroidRunner.java      | 2 +-
 compiler/testData/codegen/box/inlineClasses/result.kt          | 2 +-
 .../codegen/box/ir/serializationRegressions/transitiveClash.kt | 1 +
 .../box/unsignedTypes/evaluateConstructorOfUnsignedType.kt     | 3 +++
 compiler/testData/codegen/box/valueClasses/jvmInline.kt        | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java
index d7b8b853795..a95405af339 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java
@@ -25,7 +25,7 @@ import org.junit.runners.AllTests;
 
 import java.io.File;
 
-//@RunWith(AllTests.class)
+@RunWith(AllTests.class)
 public class AndroidRunner {
 
     private static PathManager pathManager;
diff --git a/compiler/testData/codegen/box/inlineClasses/result.kt b/compiler/testData/codegen/box/inlineClasses/result.kt
index a9c33ff2884..9e9b036233b 100644
--- a/compiler/testData/codegen/box/inlineClasses/result.kt
+++ b/compiler/testData/codegen/box/inlineClasses/result.kt
@@ -1,7 +1,7 @@
 // IGNORE_BACKEND: WASM, JS_IR
 // IGNORE_BACKEND_FIR: JVM_IR
+// IGNORE_BACKEND: ANDROID
 // FILE: result.kt
-
 package kotlin
 
 inline class Result(val value: Any?)
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt b/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt
index de18d4c9273..b7d334e0fff 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt
@@ -4,6 +4,7 @@
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND: NATIVE
+// IGNORE_BACKEND: ANDROID
 // IGNORE_LIGHT_ANALYSIS
 // MODULE: lib1
 // FILE: lib1.kt
diff --git a/compiler/testData/codegen/box/unsignedTypes/evaluateConstructorOfUnsignedType.kt b/compiler/testData/codegen/box/unsignedTypes/evaluateConstructorOfUnsignedType.kt
index bc983847e03..f1f2f09fc7e 100644
--- a/compiler/testData/codegen/box/unsignedTypes/evaluateConstructorOfUnsignedType.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/evaluateConstructorOfUnsignedType.kt
@@ -2,6 +2,9 @@
 // WITH_REFLECT
 // TARGET_BACKEND: JVM
 
+// TODO: it's not clear why compilation fails for Android
+// IGNORE_BACKEND: ANDROID
+
 @file:Suppress("INVISIBLE_MEMBER")
 
 annotation class AnnoUB(val ub0: UByte, val ub1: UByte)
diff --git a/compiler/testData/codegen/box/valueClasses/jvmInline.kt b/compiler/testData/codegen/box/valueClasses/jvmInline.kt
index cdb5ca6edf9..e5dda1f3c98 100644
--- a/compiler/testData/codegen/box/valueClasses/jvmInline.kt
+++ b/compiler/testData/codegen/box/valueClasses/jvmInline.kt
@@ -2,6 +2,7 @@
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_DEXING
 // IGNORE_BACKEND: WASM
+// IGNORE_BACKEND: ANDROID
 
 // FILE: 1.kt