Fix kotlin-old bot
Change-Id: I70c72441337948d9e9c9ab31033adca56f4b0662
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java
index a152459..e60c8b6 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java
@@ -94,6 +94,15 @@
private void inspect(
HorizontallyMergedClassesInspector inspector, KotlinLambdasInInput lambdasInInput) {
+ if (hasKotlinCGeneratedLambdaClasses()
+ && kotlinParameters.getCompilerVersion().isLessThan(KOTLINC_1_5_0)) {
+ // Don't check exactly how J-style Kotlin lambdas are merged for kotlinc before 1.5.0.
+ assertEquals(
+ parameters.isDexRuntime() && parameters.canUseDefaultAndStaticInterfaceMethods() ? 2 : 10,
+ inspector.getMergeGroups().size());
+ return;
+ }
+
if (!allowAccessModification && hasKotlinCGeneratedLambdaClasses()) {
// Only a subset of all J-style Kotlin lambdas are merged without -allowaccessmodification.
Set<ClassReference> unmergedLambdas =
@@ -214,7 +223,13 @@
lambdasInOutput.add(classReference);
}
}
- assertEquals(0, lambdasInOutput.size());
+ assertEquals(
+ kotlinParameters.getCompilerVersion().isGreaterThanOrEqualTo(KOTLINC_1_5_0)
+ ? 0
+ : (parameters.isDexRuntime() && parameters.canUseDefaultAndStaticInterfaceMethods()
+ ? 2
+ : 8),
+ lambdasInOutput.size());
}
private boolean hasKotlinCGeneratedLambdaClasses() {
