Fix Kotlin test for both kotlin-dev and older versions
Change-Id: I299ae3e4a4c907864836ca9dfc625584ff8035dd
diff --git a/src/test/java/com/android/tools/r8/KotlinTestParameters.java b/src/test/java/com/android/tools/r8/KotlinTestParameters.java
index 92285b9..ba16ee1 100644
--- a/src/test/java/com/android/tools/r8/KotlinTestParameters.java
+++ b/src/test/java/com/android/tools/r8/KotlinTestParameters.java
@@ -63,11 +63,15 @@
}
public boolean isNewerThanOrEqualTo(KotlinCompilerVersion otherVersion) {
- return kotlinc.getCompilerVersion().isGreaterThanOrEqualTo(otherVersion);
+ return getCompilerVersion().isGreaterThanOrEqualTo(otherVersion);
}
public boolean isNewerThan(KotlinCompilerVersion otherVersion) {
- return kotlinc.getCompilerVersion().isGreaterThan(otherVersion);
+ return getCompilerVersion().isGreaterThan(otherVersion);
+ }
+
+ public boolean isOlderThanOrEqualTo(KotlinCompilerVersion otherVersion) {
+ return getCompilerVersion().isLessThanOrEqualTo(otherVersion);
}
public boolean isOlderThan(KotlinCompilerVersion otherVersion) {
diff --git a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
index ef121d8..0939bd2 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
@@ -59,7 +59,10 @@
&& parameters.isDexRuntime()
&& parameters.getApiLevel().isLessThan(AndroidApiLevel.N)) {
// Kotlin stdlib has references to classes introduced at API level 24.
- diagnostics.assertWarningsCount(3);
+ diagnostics.assertWarningsCount(
+ kotlinTestParameters.isOlderThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_9_21)
+ ? 2
+ : 3);
diagnostics.assertAllWarningsMatch(
DiagnosticsMatcher.diagnosticType(InterfaceDesugarMissingTypeDiagnostic.class));
} else {
