diff options
| author | Brett Chabot <brettchabot@android.com> | 2009-10-21 22:33:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-21 22:33:53 -0700 |
| commit | 7733978a181b90f209396329e4033e9e2d66feb7 (patch) | |
| tree | 56871ff38197a379213a853de584a7e78d0baf1c /tests/AndroidTests | |
| parent | 2fe121025cd8f24a3652728effe86188a9d4b5fa (diff) | |
| parent | 5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2 (diff) | |
| download | frameworks_base-7733978a181b90f209396329e4033e9e2d66feb7.zip frameworks_base-7733978a181b90f209396329e4033e9e2d66feb7.tar.gz frameworks_base-7733978a181b90f209396329e4033e9e2d66feb7.tar.bz2 | |
am 5f2ae667: am 76bb9a36: Merge change I1932e8f8 into eclair
Merge commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2' into eclair-mr2-plus-aosp
* commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2':
Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
Diffstat (limited to 'tests/AndroidTests')
| -rw-r--r-- | tests/AndroidTests/src/com/android/unit_tests/HeapTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java b/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java index d51cc26..f6ae6f6 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java @@ -541,7 +541,8 @@ public class HeapTest extends TestCase { } } - @SmallTest + // TODO: flaky test + //@SmallTest public void testExternalOomeLarge() { /* Just shy of the typical max heap size so that it will actually * try to allocate it instead of short-circuiting. |