Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(685)

Unified Diff: base/allocator/partition_allocator/partition_alloc_unittest.cc

Issue 2616063002: PartitionAllocator: relax condition that skips test on lowmem devices (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4081d857811178440822664e39acbfc943d78a6f..b404ab752ea04a60045d1e9cd5e30d66e39a819d 100644
--- a/base/allocator/partition_allocator/partition_alloc_unittest.cc
+++ b/base/allocator/partition_allocator/partition_alloc_unittest.cc
@@ -611,12 +611,6 @@ TEST(PartitionAllocTest, GenericAlloc) {
// Test the generic allocation functions can handle some specific sizes of
// interest.
TEST(PartitionAllocTest, GenericAllocSizes) {
- // TODO(crbug.com/678782): Where necessary and possible, disable the
- // platform's OOM-killing behavior. OOM-killing makes this test flaky on
- // low-memory devices.
- if (!IsLargeMemoryDevice())
- return;
-
TestSetup();
void* ptr = partitionAllocGeneric(genericAllocator.root(), 0, typeName);
@@ -714,12 +708,6 @@ TEST(PartitionAllocTest, GenericAllocSizes) {
// Test that we can fetch the real allocated size after an allocation.
TEST(PartitionAllocTest, GenericAllocGetSize) {
- // TODO(crbug.com/678782): Where necessary and possible, disable the
- // platform's OOM-killing behavior. OOM-killing makes this test flaky on
- // low-memory devices.
- if (!IsLargeMemoryDevice())
- return;
-
TestSetup();
void* ptr;
@@ -1281,8 +1269,10 @@ static void DoReturnNullTest(size_t allocSize) {
// TODO(crbug.com/678782): Where necessary and possible, disable the
// platform's OOM-killing behavior. OOM-killing makes this test flaky on
// low-memory devices.
- if (!IsLargeMemoryDevice())
+ if (!IsLargeMemoryDevice()) {
+ LOG(WARNING) << "Skipping test on this device because of crbug.com/678782";
return;
+ }
TestSetup();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698