commit c11ddf096e58245c2c67514dc9e5a2098dd8f705
author Søren Gjesse <sgjesse@google.com> Tue Mar 21 18:16:54 2023 +0100
committer Søren Gjesse <sgjesse@google.com> Tue Mar 21 18:16:54 2023 +0100
tree 21b25e980fc9f6a45483a71f7f7b8896b0b07511
parent 6686e7dffea83ea894438b496c065d0a18cda206

Version 8.0.38

Backport test to 8.0 test APIs.

Bug: b/274337639
Change-Id: I35ae6d701fa92a6a7a734f9c0296d1383fed8e20

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 a271995..841c2cb 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 = "8.0.37";
+  public static final String LABEL = "8.0.38";
 
   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..48d1d1e 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,7 +41,7 @@
 
   @Test
   public void testJvm() throws Exception {
-    parameters.assumeJvmTestParameters();
+    assumeTrue(parameters.isCfRuntime() && parameters.getApiLevel().equals(AndroidApiLevel.B));
     testForJvm(parameters)
         .addProgramClassFileData(patchedDump())
         .run(parameters.getRuntime(), MAIN_CLASS)
@@ -48,7 +50,7 @@
 
   @Test
   public void testD8() throws Exception {
-    parameters.assumeDexRuntime();
+    assumeTrue(parameters.isDexRuntime());
     testForD8(parameters.getBackend())
         .addProgramClassFileData(patchedDump())
         .setMinApi(parameters)
@@ -58,7 +60,6 @@
 
   @Test
   public void testR8() throws Exception {
-    parameters.assumeR8TestParameters();
     testForR8(parameters.getBackend())
         .addProgramClassFileData(patchedDump())
         .addKeepMainRule(MAIN_CLASS)