commit 2e3f7385bf7387c82818848550193d540433556e
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Apr 06 08:30:31 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 06 08:30:31 2018 +0000
tree a8114b40158bd7e07e1f50aa9b36bab1ad83759f
parent b892d65d2a0eae8263ce606d2b7e60733d3918e5
parent 34876c4310fabd70b41f80eca8539bc266f1e2cd

Merge "Update FinallyBlockTest to handle differences in Java compilers"

src/test/java/com/android/tools/r8/debug/FinallyBlockTest.java

diff --git a/src/test/java/com/android/tools/r8/debug/FinallyBlockTest.java b/src/test/java/com/android/tools/r8/debug/FinallyBlockTest.java
index 2d8119f..05bff95 100644
--- a/src/test/java/com/android/tools/r8/debug/FinallyBlockTest.java
+++ b/src/test/java/com/android/tools/r8/debug/FinallyBlockTest.java
@@ -80,7 +80,9 @@
         checkLine(FILE, 11), // throw without catch
         stepOver(),
         checkLine(FILE, 18), // finally
-        stepOver(),
+        // Don't single step here as some Java compilers generate line entry 19 and some don't.
+        breakpoint(CLASS, "callFinallyBlock", 26),
+        run(),
         checkLine(FILE, 26), // catch in callFinallyBlock
         run());
   }