commit 7352a1289cf71007f6e3612d173d78cfa590a3b3
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Dec 06 17:52:02 2021 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Dec 06 17:52:02 2021 +0100
tree 308073b75e5979399e41e68bee6695efe8c58e72
parent 310c750fc942eebe3fa29efbb14faa6d586e41f8

[Metadata] Fix old kotlinc tests

Change-Id: I72dca30bc7a41ba68930fe97fdf0b9c1af6448a9

src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInExtensionFunctionTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInExtensionFunctionTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInExtensionFunctionTest.java
index 069ba8a..19550d1 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInExtensionFunctionTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInExtensionFunctionTest.java
@@ -109,8 +109,8 @@
             .addClasspathFiles(libJar)
             .addSourceFiles(getKotlinFileInTest(PKG_PREFIX + "/extension_function_app", "main"))
             .setOutputPath(temp.newFolder().toPath())
-            .compile(full);
-    if (full) {
+            .compile(full || kotlinParameters.isOlderThanMinSupported());
+    if (full || kotlinParameters.isOlderThanMinSupported()) {
       return;
     }
 

src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInExtensionPropertyTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInExtensionPropertyTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInExtensionPropertyTest.java
index e5c43ed..3a8760a 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInExtensionPropertyTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInExtensionPropertyTest.java
@@ -106,8 +106,8 @@
             .addClasspathFiles(libJar)
             .addSourceFiles(getKotlinFileInTest(PKG_PREFIX + "/extension_property_app", "main"))
             .setOutputPath(temp.newFolder().toPath())
-            .compile(full);
-    if (full) {
+            .compile(full || kotlinParameters.isOlderThanMinSupported());
+    if (full || kotlinParameters.isOlderThanMinSupported()) {
       return;
     }
 

src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInFunctionTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInFunctionTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInFunctionTest.java
index ab548e9..875b475 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInFunctionTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInFunctionTest.java
@@ -104,8 +104,8 @@
             .addClasspathFiles(libJar)
             .addSourceFiles(getKotlinFileInTest(PKG_PREFIX + "/function_app", "main"))
             .setOutputPath(temp.newFolder().toPath())
-            .compile(full);
-    if (full) {
+            .compile(full || kotlinParameters.isOlderThanMinSupported());
+    if (full || kotlinParameters.isOlderThanMinSupported()) {
       return;
     }