[Retrace] Start running AmbiguousWithSignatureVerboseStackTrace again
Bug: 169346455
Change-Id: I207694a16eb93ebd0a7759aaf9ea03bebe1ffda8
diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceTests.java b/src/test/java/com/android/tools/r8/retrace/RetraceTests.java
index 50e8e34..3a8fd5b 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceTests.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceTests.java
@@ -306,7 +306,6 @@
@Test
public void testAmbiguousMissingLineVerbose() throws Exception {
- assumeTrue("b/169346455", false);
runRetraceTest(new AmbiguousWithSignatureVerboseStackTrace());
}
diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousWithSignatureVerboseStackTrace.java b/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousWithSignatureVerboseStackTrace.java
index 9c08875..4c39bf2 100644
--- a/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousWithSignatureVerboseStackTrace.java
+++ b/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousWithSignatureVerboseStackTrace.java
@@ -33,10 +33,7 @@
return Arrays.asList(
"java.lang.IndexOutOfBoundsException",
"\tat java.util.ArrayList.get(ArrayList.java:411)",
- "\tat com.android.tools.r8.Internal.boolean foo(int,int)(Internal.java)",
- "\t<OR> at com.android.tools.r8.Internal.void foo(int)(Internal.java)",
- "\t<OR> at com.android.tools.r8.Internal.void foo(int,boolean)(Internal.java)",
- "\t<OR> at com.android.tools.r8.Internal.void foo(int,int)(Internal.java)");
+ "\tat com.android.tools.r8.Internal.foo(Internal.java)");
}
@Override
@@ -45,9 +42,9 @@
"java.lang.IndexOutOfBoundsException",
"\tat java.util.ArrayList.get(ArrayList.java:411)",
"\tat com.android.tools.r8.Internal.boolean foo(int,int)(Internal.java)",
- "\t<OR> at com.android.tools.r8.Internal.void foo(int)(Internal.java)",
- "\t<OR> at com.android.tools.r8.Internal.void foo(int,boolean)(Internal.java)",
- "\t<OR> at com.android.tools.r8.Internal.void foo(int,int)(Internal.java)");
+ "\t<OR #1> at com.android.tools.r8.Internal.void foo(int)(Internal.java)",
+ "\t<OR #2> at com.android.tools.r8.Internal.void foo(int,boolean)(Internal.java)",
+ "\t<OR #3> at com.android.tools.r8.Internal.void foo(int,int)(Internal.java)");
}
@Override
