From 9c5702582b8f0ce2a0ce536dff7e02de10317163 Mon Sep 17 00:00:00 2001 From: Alex Light Date: Tue, 13 Feb 2018 15:09:44 -0800 Subject: 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 --- test/1928-exception-event-exception/src/art/StackTrace.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/1928-exception-event-exception/src') diff --git a/test/1928-exception-event-exception/src/art/StackTrace.java b/test/1928-exception-event-exception/src/art/StackTrace.java index b12c3df66b..2ea2f201e8 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 @@ public class StackTrace { // 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); } -- cgit v1.2.3-59-g8ed1b