Commit 7223079d authored by primiano's avatar primiano Committed by Commit bot

PartitionAllocator: relax condition that skips test on lowmem devices

Some of the exclusions introduced by crrev.com/2618853002 to deal
with OOM flakiness on lowmem devices are too aggressive and were
already dealt with by crrev.com/2589813002 .
Effectively this is a partial revert of crrev.com/2618853002 .

BUG=675255

Review-Url: https://codereview.chromium.org/2616063002
Cr-Commit-Position: refs/heads/master@{#442075}
parent b520619b
...@@ -611,12 +611,6 @@ TEST(PartitionAllocTest, GenericAlloc) { ...@@ -611,12 +611,6 @@ TEST(PartitionAllocTest, GenericAlloc) {
// Test the generic allocation functions can handle some specific sizes of // Test the generic allocation functions can handle some specific sizes of
// interest. // interest.
TEST(PartitionAllocTest, GenericAllocSizes) { 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(); TestSetup();
void* ptr = partitionAllocGeneric(genericAllocator.root(), 0, typeName); void* ptr = partitionAllocGeneric(genericAllocator.root(), 0, typeName);
...@@ -714,12 +708,6 @@ TEST(PartitionAllocTest, GenericAllocSizes) { ...@@ -714,12 +708,6 @@ TEST(PartitionAllocTest, GenericAllocSizes) {
// Test that we can fetch the real allocated size after an allocation. // Test that we can fetch the real allocated size after an allocation.
TEST(PartitionAllocTest, GenericAllocGetSize) { 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(); TestSetup();
void* ptr; void* ptr;
...@@ -1281,8 +1269,10 @@ static void DoReturnNullTest(size_t allocSize) { ...@@ -1281,8 +1269,10 @@ static void DoReturnNullTest(size_t allocSize) {
// TODO(crbug.com/678782): Where necessary and possible, disable the // TODO(crbug.com/678782): Where necessary and possible, disable the
// platform's OOM-killing behavior. OOM-killing makes this test flaky on // platform's OOM-killing behavior. OOM-killing makes this test flaky on
// low-memory devices. // low-memory devices.
if (!IsLargeMemoryDevice()) if (!IsLargeMemoryDevice()) {
LOG(WARNING) << "Skipping test on this device because of crbug.com/678782";
return; return;
}
TestSetup(); TestSetup();
......
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