From 61ac770449cce82a6fac6c0cfb6a30b4ec1fbcf7 Mon Sep 17 00:00:00 2001 From: "mstarzinger@chromium.org" Date: Mon, 8 Jul 2013 09:07:57 +0000 Subject: [PATCH] Make test-heap/TestInternalWeakLists pass with the i18n extension loaded R=mstarzinger@chromium.org BUG=v8:2745 Review URL: https://codereview.chromium.org/18654006 Patch from Jochen Eisinger . git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15542 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- test/cctest/test-heap.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc index be1098c..cc1e042 100644 --- a/test/cctest/test-heap.cc +++ b/test/cctest/test-heap.cc @@ -1327,6 +1327,11 @@ TEST(TestInternalWeakLists) { for (int i = 0; i < kNumTestContexts; i++) { ctx[i] = v8::Context::New(v8::Isolate::GetCurrent()); + // Collect garbage that might have been created by one of the + // installed extensions. + isolate->compilation_cache()->Clear(); + heap->CollectAllGarbage(Heap::kNoGCFlags); + bool opt = (FLAG_always_opt && i::V8::UseCrankshaft()); CHECK_EQ(i + 1, CountNativeContexts()); @@ -1388,6 +1393,7 @@ TEST(TestInternalWeakLists) { } // Force compilation cache cleanup. + HEAP->NotifyContextDisposed(); HEAP->CollectAllGarbage(Heap::kNoGCFlags); // Dispose the native contexts one by one. @@ -3011,6 +3017,10 @@ TEST(Regress169209) { i::FLAG_harmony_typed_arrays = false; i::FLAG_harmony_array_buffer = false; + // Disable loading the i18n extension which breaks the assumptions of this + // test about the heap layout. + i::FLAG_enable_i18n = false; + CcTest::InitializeVM(); Isolate* isolate = Isolate::Current(); Heap* heap = isolate->heap(); -- 2.7.4