commit 49f738ff7377dacecf0fca39fec5146beb251ea3
author Søren Gjesse <sgjesse@google.com> Tue Mar 21 18:14:15 2023 +0100
committer Søren Gjesse <sgjesse@google.com> Tue Mar 21 18:14:15 2023 +0100
tree a7c156a1ab56dea4fad35d1fcd07540c8ed2aa69
parent 6edb00fb23e41b28d4794cfa69d706d5c5aa3fba

Version 4.0.57

Backport test to 4.0 test APIs.

Bug: b/274337639
Change-Id: Iecf03a2ad9dcdbd53e6c572d2f08915248435682

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index b476e1c..73fa58d 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "4.0.56";
+  public static final String LABEL = "4.0.57";
 
   private Version() {
   }

src/test/java/com/android/tools/r8/cf/frames/InitBeforeNewInInstructionStreamTest.java

diff --git a/src/test/java/com/android/tools/r8/cf/frames/InitBeforeNewInInstructionStreamTest.java b/src/test/java/com/android/tools/r8/cf/frames/InitBeforeNewInInstructionStreamTest.java
index 1d93a7a..db6e659 100644
--- a/src/test/java/com/android/tools/r8/cf/frames/InitBeforeNewInInstructionStreamTest.java
+++ b/src/test/java/com/android/tools/r8/cf/frames/InitBeforeNewInInstructionStreamTest.java
@@ -4,10 +4,12 @@
 package com.android.tools.r8.cf.frames;
 
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.StringUtils;
 import javassist.ByteArrayClassPath;
 import javassist.ClassPool;
@@ -39,8 +41,8 @@
 
   @Test
   public void testJvm() throws Exception {
-    parameters.assumeJvmTestParameters();
-    testForJvm(parameters)
+    assumeTrue(parameters.isCfRuntime() && parameters.getApiLevel().equals(AndroidApiLevel.B));
+    testForJvm()
         .addProgramClassFileData(patchedDump())
         .run(parameters.getRuntime(), MAIN_CLASS)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);
@@ -48,21 +50,20 @@
 
   @Test
   public void testD8() throws Exception {
-    parameters.assumeDexRuntime();
+    assumeTrue(parameters.isDexRuntime());
     testForD8(parameters.getBackend())
         .addProgramClassFileData(patchedDump())
-        .setMinApi(parameters)
+        .setMinApi(parameters.getApiLevel())
         .run(parameters.getRuntime(), MAIN_CLASS)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);
   }
 
   @Test
   public void testR8() throws Exception {
-    parameters.assumeR8TestParameters();
     testForR8(parameters.getBackend())
         .addProgramClassFileData(patchedDump())
         .addKeepMainRule(MAIN_CLASS)
-        .setMinApi(parameters)
+        .setMinApi(parameters.getApiLevel())
         .run(parameters.getRuntime(), MAIN_CLASS)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);
   }