From 4e38ff3b72eba0b7924ac919736f86959e234ce8 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Thu, 25 May 2017 13:28:56 +0300 Subject: [PATCH] Exclude several tests about inner generic signature on Android There is no information about inner generic class in the middle of signature on android. For example, on JVM we can get signature: `FirstInner$SecondInner.ThirdInnner;` But on Android it would be `FirstInner$SecondInner$ThirdInnner;` --- .../jetbrains/kotlin/android/tests/SpecialFiles.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java index b808cebca21..87f72177f8b 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,6 +97,14 @@ public class SpecialFiles { excludedFiles.add("kt11121.kt"); excludedFiles.add("kt5112.kt"); + // Different format of inner signature on Android and JVM + excludedFiles.add("signatureOfDeepGenericInner.kt"); + excludedFiles.add("signatureOfDeepInner.kt"); + excludedFiles.add("signatureOfDeepInnerLastGeneric.kt"); + excludedFiles.add("signatureOfGenericInnerGenericOuter.kt"); + excludedFiles.add("signatureOfGenericInnerSimpleOuter.kt"); + excludedFiles.add("signatureOfSimpleInnerSimpleOuter.kt"); + // Some classes are not visible on android excludedFiles.add("classpath.kt");