| 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/084-class-init/src/Main.java b/test/084-class-init/src/Main.java index f777113..de28ed9 100644 --- a/test/084-class-init/src/Main.java +++ b/test/084-class-init/src/Main.java
@@ -76,8 +76,8 @@ static class FieldThread extends Thread { public void run() { - /* allow class init to start */ - Main.sleep(200); + /* allow SlowInit's <clinit> to start */ + Main.sleep(1000); /* collect fields; should delay until class init completes */ int field0, field1, field2, field3; @@ -87,7 +87,7 @@ field3 = SlowInit.FIELD3.getValue(); /* let MethodThread print first */ - Main.sleep(400); + Main.sleep(5000); System.out.println("Fields (child thread): " + field0 + field1 + field2 + field3); } @@ -95,8 +95,8 @@ static class MethodThread extends Thread { public void run() { - /* allow class init to start */ - Main.sleep(200); + /* allow SlowInit's <clinit> to start */ + Main.sleep(1000); /* use a method that shouldn't be accessible yet */ SlowInit.printMsg("MethodThread message");