Update expected status and close triage issues.
Fixes: b/119938529
Fixes: b/120400625
Fixes: b/120402198
Change-Id: I6045e694bbd84f78fdbf1f6f67675094d23bc4bb
diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index 10c5358..f3c3dc5 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -498,37 +498,23 @@
static {
ImmutableMap.Builder<DexVm.Version, List<String>> builder = ImmutableMap.builder();
builder
- .put(
- DexVm.Version.V13_0_0,
- ImmutableList.of("454-get-vreg", "457-regs", "543-env-long-ref", "518-null-array-get"))
- .put(
- DexVm.Version.V12_0_0,
- ImmutableList.of("454-get-vreg", "457-regs", "543-env-long-ref", "518-null-array-get"))
+ .put(DexVm.Version.V13_0_0, ImmutableList.of("543-env-long-ref", "518-null-array-get"))
+ .put(DexVm.Version.V12_0_0, ImmutableList.of("543-env-long-ref", "518-null-array-get"))
.put(
DexVm.Version.V10_0_0,
ImmutableList.of(
// TODO(b/144975341): Triage, Verif error.
"518-null-array-get",
// TODO(b/144975341): Triage, Linking error.
- "457-regs",
- "543-env-long-ref",
- "454-get-vreg"))
+ "543-env-long-ref"))
.put(
DexVm.Version.V9_0_0,
ImmutableList.of(
- // TODO(120400625): Triage.
- "454-get-vreg",
- // TODO(120402198): Triage.
- "457-regs",
// TODO(120401674): Triage.
"543-env-long-ref",
// TODO(120261858) Triage.
"518-null-array-get"))
- .put(
- DexVm.Version.V8_1_0,
- ImmutableList.of(
- // TODO(119938529): Triage.
- "709-checker-varhandles", "454-get-vreg", "457-regs"))
+ .put(DexVm.Version.V8_1_0, ImmutableList.of())
.put(
DexVm.Version.V7_0_0,
ImmutableList.of(
@@ -872,7 +858,12 @@
DexVm.Version.V4_4_4,
DexVm.Version.V5_1_1,
DexVm.Version.V6_0_1,
- DexVm.Version.V7_0_0)))
+ DexVm.Version.V7_0_0,
+ DexVm.Version.V8_1_0,
+ DexVm.Version.V9_0_0,
+ DexVm.Version.V10_0_0,
+ DexVm.Version.V12_0_0,
+ DexVm.Version.V13_0_0)))
.put("454-get-vreg", TestCondition.match(TestCondition.R8DEX_COMPILER))
// Fails: regs_jni.cc:42] Check failed: GetVReg(m, 0, kIntVReg, &value)
// The R8/D8 code does not put values in the same registers as the tests expects.
@@ -884,7 +875,12 @@
DexVm.Version.V4_4_4,
DexVm.Version.V5_1_1,
DexVm.Version.V6_0_1,
- DexVm.Version.V7_0_0)))
+ DexVm.Version.V7_0_0,
+ DexVm.Version.V8_1_0,
+ DexVm.Version.V9_0_0,
+ DexVm.Version.V10_0_0,
+ DexVm.Version.V12_0_0,
+ DexVm.Version.V13_0_0)))
.put("457-regs", TestCondition.match(TestCondition.R8DEX_COMPILER))
// Class not found.
.put("529-checker-unresolved", TestCondition.any())
diff --git a/src/test/java/com/android/tools/r8/jasmin/MemberResolutionTest.java b/src/test/java/com/android/tools/r8/jasmin/MemberResolutionTest.java
index 5db275b..aecc306 100644
--- a/src/test/java/com/android/tools/r8/jasmin/MemberResolutionTest.java
+++ b/src/test/java/com/android/tools/r8/jasmin/MemberResolutionTest.java
@@ -579,12 +579,10 @@
private void ensureSameOutput(JasminBuilder app) throws Exception {
String javaOutput = runOnJava(app, MAIN_CLASS);
- String dxOutput = runOnArtDx(app, MAIN_CLASS);
String d8Output = runOnArtD8(app, MAIN_CLASS);
String r8Output = runOnArtR8(app, MAIN_CLASS);
String r8ShakenOutput = runOnArtR8(app, MAIN_CLASS, keepMainProguardConfiguration(MAIN_CLASS),
null);
- Assert.assertEquals(javaOutput, dxOutput);
Assert.assertEquals(javaOutput, d8Output);
Assert.assertEquals(javaOutput, r8Output);
Assert.assertEquals(javaOutput, r8ShakenOutput);
@@ -603,7 +601,6 @@
private void ensureAllFail(JasminBuilder app) throws Exception {
ensureFails(app, MAIN_CLASS, this::runOnJavaRaw);
- ensureFails(app, MAIN_CLASS, this::runOnArtDxRaw);
ensureFails(app, MAIN_CLASS, this::runOnArtD8Raw);
ensureFails(app, MAIN_CLASS, (a, m) -> runOnArtR8Raw(a, m, null));
ensureFails(app, MAIN_CLASS,
@@ -623,7 +620,6 @@
}
};
runtest.accept(() -> runOnJavaNoVerifyRaw(app, MAIN_CLASS), null);
- runtest.accept(() -> runOnArtDxRaw(app, MAIN_CLASS), null);
runtest.accept(() -> runOnArtD8Raw(app, MAIN_CLASS), CompilerUnderTest.D8);
runtest.accept(() -> runOnArtR8Raw(app, MAIN_CLASS, null), CompilerUnderTest.R8);
runtest.accept(() -> runOnArtR8Raw(app, MAIN_CLASS, keepMainProguardConfiguration(MAIN_CLASS),
@@ -644,8 +640,6 @@
private void ensureRuntimeException(JasminBuilder app, Class exception) throws Exception {
String name = exception.getSimpleName();
- ProcessResult dxOutput = runOnArtDxRaw(app, MAIN_CLASS);
- Assert.assertTrue(dxOutput.stderr.contains(name));
ProcessResult d8Output = runOnArtD8Raw(app, MAIN_CLASS);
Assert.assertTrue(d8Output.stderr.contains(name));
ProcessResult r8Output = runOnArtR8Raw(app, MAIN_CLASS, null);
@@ -660,16 +654,14 @@
private void ensureRuntimeException(JasminBuilder app, JasminBuilder library, Class exception)
throws Exception {
String name = exception.getSimpleName();
- ProcessResult dxOutput = runOnArtDxRaw(app, library, MAIN_CLASS);
- Assert.assertTrue(dxOutput.stderr.contains(name));
ProcessResult d8Output = runOnArtD8Raw(app, library, MAIN_CLASS);
- Assert.assertTrue(d8Output.stderr.contains(name));
+ Assert.assertTrue(d8Output.toString(), d8Output.stderr.contains(name));
ProcessResult r8Output = runOnArtR8Raw(app, library, MAIN_CLASS,
noShrinkingNoMinificationProguardConfiguration(), null);
- Assert.assertTrue(r8Output.stderr.contains(name));
+ Assert.assertTrue(r8Output.toString(), r8Output.stderr.contains(name));
ProcessResult r8ShakenOutput = runOnArtR8Raw(app, library, MAIN_CLASS,
keepMainProguardConfiguration(MAIN_CLASS), null);
- Assert.assertTrue(r8ShakenOutput.stderr.contains(name));
+ Assert.assertTrue(r8ShakenOutput.toString(), r8ShakenOutput.stderr.contains(name));
ProcessResult javaOutput = runOnJavaNoVerifyRaw(app, library, MAIN_CLASS);
Assert.assertTrue(javaOutput.stderr.contains(name));
}
