Chromium Code Reviews| Index: base/allocator/partition_allocator/partition_alloc_unittest.cc |
| diff --git a/base/allocator/partition_allocator/partition_alloc_unittest.cc b/base/allocator/partition_allocator/partition_alloc_unittest.cc |
| index 30a89226f2b34393d5ac8e5a72e5f2b887de880c..311e82cf2240cac659d0584f5a1618bdf914940a 100644 |
| --- a/base/allocator/partition_allocator/partition_alloc_unittest.cc |
| +++ b/base/allocator/partition_allocator/partition_alloc_unittest.cc |
| @@ -611,6 +611,12 @@ TEST(PartitionAllocTest, GenericAlloc) { |
| // Test the generic allocation functions can handle some specific sizes of |
| // interest. |
| TEST(PartitionAllocTest, GenericAllocSizes) { |
| + // TODO: Where necessary and possible, disable the platform's OOM-killing |
|
danakj
2017/01/05 23:00:44
TODO, unlike the old FIXME, always comes with a na
palmer
2017/01/06 00:30:53
Done.
|
| + // behavior. OOM-killing makes this test flaky on low-memory devices. |
| + // crbug.com/678782 |
| + if (!IsLargeMemoryDevice()) |
| + return; |
| + |
| TestSetup(); |
| void* ptr = partitionAllocGeneric(genericAllocator.root(), 0, typeName); |
| @@ -708,6 +714,10 @@ TEST(PartitionAllocTest, GenericAllocSizes) { |
| // Test that we can fetch the real allocated size after an allocation. |
| TEST(PartitionAllocTest, GenericAllocGetSize) { |
| + // TODO: Where necessary and possible, disable the platform's OOM-killing |
| + // behavior. OOM-killing makes this test flaky on low-memory devices. |
|
danakj
2017/01/05 23:00:44
If it's flaky shouldn't it be disabled, or is the
palmer
2017/01/06 00:30:53
Oops, forgot to put the actual code in. Sigh.
|
| + // crbug.com/678782 |
| + |
| TestSetup(); |
| void* ptr; |
| @@ -1266,6 +1276,12 @@ TEST(PartitionAllocTest, LostFreePagesBug) { |
| #if !defined(ARCH_CPU_64_BITS) || defined(OS_POSIX) |
| static void DoReturnNullTest(size_t allocSize) { |
| + // TODO: Where necessary and possible, disable the platform's OOM-killing |
| + // behavior. OOM-killing makes this test flaky on low-memory devices. |
| + // crbug.com/678782 |
| + if (!IsLargeMemoryDevice()) |
| + return; |
| + |
| TestSetup(); |
| EXPECT_TRUE(SetAddressSpaceLimit()); |