[heap] Test fixes

test/cctest/heap/test-incremental-marking.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 
 #ifdef __linux__
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ skipping 122 matching lines @@
   while (platform.PendingIdleTask()) {
     platform.PerformIdleTask(kLongIdleTimeInSeconds);
   }
   CHECK(marking->IsStopped());
   i::V8::SetPlatformForTesting(old_platform);
 }
 
 
 TEST(IncrementalMarkingUsingIdleTasksAfterGC) {
   if (!i::FLAG_incremental_marking) return;
+
+  const double kLongIdleTimeInSeconds = 1;
+  const double kShortIdleTimeInSeconds = 0.010;
+
   CcTest::InitializeVM();
   v8::Platform* old_platform = i::V8::GetCurrentPlatform();
   MockPlatform platform(old_platform);
   i::V8::SetPlatformForTesting(&platform);
   i::heap::SimulateFullSpace(CcTest::heap()->old_space());
   CcTest::heap()->CollectAllGarbage();
+  // Perform any pending idle tasks.
+  while (platform.PendingIdleTask()) {
+    platform.PerformIdleTask(kLongIdleTimeInSeconds);
+  }
+  CHECK(!platform.PendingIdleTask());
   i::IncrementalMarking* marking = CcTest::heap()->incremental_marking();
   marking->Stop();
   marking->Start();
   CHECK(platform.PendingIdleTask());
-  const double kLongIdleTimeInSeconds = 1;
-  const double kShortIdleTimeInSeconds = 0.010;
   const int kShortStepCount = 10;
   for (int i = 0; i < kShortStepCount && platform.PendingIdleTask(); i++) {
     platform.PerformIdleTask(kShortIdleTimeInSeconds);
   }
   while (platform.PendingIdleTask()) {
     platform.PerformIdleTask(kLongIdleTimeInSeconds);
   }
   CHECK(marking->IsStopped());
   i::V8::SetPlatformForTesting(old_platform);
 }
@@ skipping 23 matching lines @@
   while (!marking->IsStopped() && platform.PendingDelayedTask()) {
     platform.PerformDelayedTask();
   }
   // There could be pending delayed task from memory reducer after GC finishes.
   CHECK(marking->IsStopped());
   i::V8::SetPlatformForTesting(old_platform);
 }
 
 }  // namespace internal
 }  // namespace v8