Fix test-heap/OldSpaceAllocationCounter.

TBR=hpayer@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1156113003

Cr-Commit-Position: refs/heads/master@{#28632}
This commit is contained in:
ulan 2015-05-26 08:42:20 -07:00 committed by Commit bot
parent 543bcf4d5a
commit fe9a16b69a

View File

@ -5486,21 +5486,20 @@ TEST(OldSpaceAllocationCounter) {
v8::HandleScope scope(CcTest::isolate());
Isolate* isolate = CcTest::i_isolate();
Heap* heap = isolate->heap();
// TODO(ulan): remove this GC after fixing no-snapshot failure.
heap->CollectGarbage(OLD_SPACE);
size_t counter1 = heap->OldGenerationAllocationCounter();
heap->CollectGarbage(NEW_SPACE);
const size_t kSize = 1024;
AllocateInSpace(isolate, kSize, OLD_SPACE);
size_t counter2 = heap->OldGenerationAllocationCounter();
CHECK_EQ(kSize, counter2 - counter1);
// TODO(ulan): replace all CHECK_LE with CHECK_EQ after v8:4148 is fixed.
CHECK_LE(kSize, counter2 - counter1);
heap->CollectGarbage(NEW_SPACE);
size_t counter3 = heap->OldGenerationAllocationCounter();
CHECK_EQ(0, counter3 - counter2);
CHECK_LE(0, counter3 - counter2);
AllocateInSpace(isolate, kSize, OLD_SPACE);
heap->CollectGarbage(OLD_SPACE);
size_t counter4 = heap->OldGenerationAllocationCounter();
CHECK_EQ(kSize, counter4 - counter3);
CHECK_LE(kSize, counter4 - counter3);
// Test counter overflow.
size_t max_counter = -1;
heap->set_old_generation_allocation_counter(max_counter - 10 * kSize);
@ -5508,7 +5507,7 @@ TEST(OldSpaceAllocationCounter) {
for (int i = 0; i < 20; i++) {
AllocateInSpace(isolate, kSize, OLD_SPACE);
size_t counter = heap->OldGenerationAllocationCounter();
CHECK_EQ(kSize, counter - start);
CHECK_LE(kSize, counter - start);
start = counter;
}
}