Ensure that all StackTrace.java files are identical for CTS
Also need to update some of the expectations since they include line
numbers from the StackTrace.java file.
These files all need to be identical in order for us to use these
tests with CTS. Fix the single difference between them.
Test: ./test.py --host -j50
Test: for i in `find . -name "StackTrace.java" -type f`; do
diff $i test/1912-get-set-local-primitive/src/art/StackTrace.java;
done
Bug: 73252141
Change-Id: Ibd412b26e3ad4c82a625a2a8cc3b73ed43e89a29
diff --git a/test/1928-exception-event-exception/src/art/StackTrace.java b/test/1928-exception-event-exception/src/art/StackTrace.java
index b12c3df..2ea2f20 100644
--- a/test/1928-exception-event-exception/src/art/StackTrace.java
+++ b/test/1928-exception-event-exception/src/art/StackTrace.java
@@ -53,7 +53,8 @@
// consistent we will suspend for the RI.
boolean suspend_thread =
!System.getProperty("java.vm.name").equals("Dalvik") &&
- !thr.equals(Thread.currentThread());
+ !thr.equals(Thread.currentThread()) &&
+ !Suspension.isSuspended(thr);
if (suspend_thread) {
Suspension.suspend(thr);
}