| commit | 741b5b7ef4c7fd4a786364bbf60d515489caff47 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jan 31 19:18:51 2012 -0800 |
| committer | Elliott Hughes <enh@google.com> | Tue Jan 31 19:20:20 2012 -0800 |
| tree | e5d5f9ee5c1fb1c177c453985eeb1242e3d73bf7 | |
| parent | 09cc2d39b3073ab0c613a9f660983e781693d958 [diff] [blame] |
Manually merge my AOSP update to the VM tests. Original change: https://android-review.googlesource.com/32051 Bug: http://code.google.com/p/android/issues/detail?id=21599 Bug: http://code.google.com/p/android/issues/detail?id=21597 Change-Id: I31e440b66b720647afab54ca39fd6eb1bbb0cb60
diff --git a/test/033-class-init-deadlock/expected.txt b/test/033-class-init-deadlock/expected.txt index 387a426..182d0da 100644 --- a/test/033-class-init-deadlock/expected.txt +++ b/test/033-class-init-deadlock/expected.txt
@@ -1,7 +1,7 @@ Deadlock test starting. A initializing... B initializing... -Deadlock test interupting threads. +Deadlock test interrupting threads. Deadlock test main thread bailing. A initialized: false B initialized: false