diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 22:35:27 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 22:35:27 -0400 |
| commit | 773fd13130948397cac5178e16d17975a06a738b (patch) | |
| tree | b96633a1ffe5e8e67de50b05074c5501fc6e5eca /tests | |
| parent | 26fe45dcb3df12eda94d93f1473cd6a2f5f345c7 (diff) | |
| parent | b8a4e5f79a33222d2ab03da7549b0a9a37da2001 (diff) | |
| download | frameworks_base-773fd13130948397cac5178e16d17975a06a738b.zip frameworks_base-773fd13130948397cac5178e16d17975a06a738b.tar.gz frameworks_base-773fd13130948397cac5178e16d17975a06a738b.tar.bz2 | |
Merge change I3429f77a into eclair
* changes:
Suppress flaky test HeapTest#testOomeLarge.
Diffstat (limited to 'tests')
| -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 d21e6a3..d51cc26 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. |