diff options
| author | 2009-10-06 19:42:08 -0700 | |
|---|---|---|
| committer | 2009-10-06 19:42:08 -0700 | |
| commit | baa44f1109ebaa723d64ffee09d5b436749cd7c2 (patch) | |
| tree | f03c57dd546d30b72aa9a5c0a1dcc93610002e9f | |
| parent | 5fd0ea8fb4827cdf183fe3c5c7f11bfd9c94d895 (diff) | |
| parent | 773fd13130948397cac5178e16d17975a06a738b (diff) | |
am 773fd131: Merge change I3429f77a into eclair
Merge commit '773fd13130948397cac5178e16d17975a06a738b' into eclair-mr2
* commit '773fd13130948397cac5178e16d17975a06a738b':
Suppress flaky test HeapTest#testOomeLarge.
| -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 d21e6a373984..d51cc26ef3fb 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java @@ -485,7 +485,8 @@ public class HeapTest extends TestCase { } } - @MediumTest + // TODO: flaky test + //@MediumTest public void testOomeLarge() throws Exception { /* Just shy of the typical max heap size so that it will actually * try to allocate it instead of short-circuiting. |