Commit ced56e1f authored by Benoit Lize's avatar Benoit Lize Committed by Commit Bot

[base] Disable OutOfMemoryDeathTest.Unchecked{M,C}allocDies on Android.

Bug: 1112840
Change-Id: Ie903e92ac8d393c6cf1c0123656c4270cc9df113
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339476
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795389}
parent 784ec9ef
...@@ -571,7 +571,16 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) { ...@@ -571,7 +571,16 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) {
// cases. // cases.
#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID) #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID)
TEST_F(OutOfMemoryDeathTest, UncheckedMallocDies) { // TODO(crbug.com/1112840): Fails on some Android bots.
#if defined(OS_ANDROID)
#define MAYBE_UncheckedMallocDies DISABLED_UncheckedMallocDies
#define MAYBE_UncheckedCallocDies DISABLED_UncheckedCallocDies
#else
#define MAYBE_UncheckedMallocDies UncheckedMallocDies
#define MAYBE_UncheckedCallocDies UncheckedCallocDies
#endif // defined(OS_ANDROID)
TEST_F(OutOfMemoryDeathTest, MAYBE_UncheckedMallocDies) {
ASSERT_OOM_DEATH({ ASSERT_OOM_DEATH({
SetUpInDeathAssert(); SetUpInDeathAssert();
void* data; void* data;
...@@ -580,7 +589,7 @@ TEST_F(OutOfMemoryDeathTest, UncheckedMallocDies) { ...@@ -580,7 +589,7 @@ TEST_F(OutOfMemoryDeathTest, UncheckedMallocDies) {
}); });
} }
TEST_F(OutOfMemoryDeathTest, UncheckedCallocDies) { TEST_F(OutOfMemoryDeathTest, MAYBE_UncheckedCallocDies) {
ASSERT_OOM_DEATH({ ASSERT_OOM_DEATH({
SetUpInDeathAssert(); SetUpInDeathAssert();
void* data; void* data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment