| Index: test/cctest/test-weaktypedarrays.cc
|
| diff --git a/test/cctest/test-weaktypedarrays.cc b/test/cctest/test-weaktypedarrays.cc
|
| index fe1ef049408da73866ccfaf03c6c278cd6e0a4cd..edfc375eb4632bf2d9c5a039b536649322a6b846 100644
|
| --- a/test/cctest/test-weaktypedarrays.cc
|
| +++ b/test/cctest/test-weaktypedarrays.cc
|
| @@ -89,7 +89,7 @@ TEST(WeakArrayBuffersFromApi) {
|
| LocalContext context;
|
| Isolate* isolate = GetIsolateFrom(&context);
|
|
|
| - CHECK_EQ(0, CountArrayBuffersInWeakList(isolate->heap()));
|
| + int start = CountArrayBuffersInWeakList(isolate->heap());
|
| {
|
| v8::HandleScope s1(context->GetIsolate());
|
| v8::Handle<v8::ArrayBuffer> ab1 = v8::ArrayBuffer::New(256);
|
| @@ -99,12 +99,12 @@ TEST(WeakArrayBuffersFromApi) {
|
|
|
| Handle<JSArrayBuffer> iab1 = v8::Utils::OpenHandle(*ab1);
|
| Handle<JSArrayBuffer> iab2 = v8::Utils::OpenHandle(*ab2);
|
| - CHECK_EQ(2, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(2, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
| CHECK(HasArrayBufferInWeakList(isolate->heap(), *iab1));
|
| CHECK(HasArrayBufferInWeakList(isolate->heap(), *iab2));
|
| }
|
| isolate->heap()->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask);
|
| - CHECK_EQ(1, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(1, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
| {
|
| HandleScope scope2(isolate);
|
| Handle<JSArrayBuffer> iab1 = v8::Utils::OpenHandle(*ab1);
|
| @@ -114,7 +114,7 @@ TEST(WeakArrayBuffersFromApi) {
|
| }
|
|
|
| isolate->heap()->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask);
|
| - CHECK_EQ(0, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(0, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
| }
|
|
|
|
|
| @@ -122,11 +122,12 @@ TEST(WeakArrayBuffersFromScript) {
|
| v8::V8::Initialize();
|
| LocalContext context;
|
| Isolate* isolate = GetIsolateFrom(&context);
|
| + int start = CountArrayBuffersInWeakList(isolate->heap());
|
|
|
| for (int i = 1; i <= 3; i++) {
|
| // Create 3 array buffers, make i-th of them garbage,
|
| // validate correct state of array buffer weak list.
|
| - CHECK_EQ(0, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(0, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
| {
|
| v8::HandleScope scope(context->GetIsolate());
|
|
|
| @@ -142,7 +143,7 @@ TEST(WeakArrayBuffersFromScript) {
|
| v8::Handle<v8::ArrayBuffer> ab3 =
|
| v8::Handle<v8::ArrayBuffer>::Cast(CompileRun("ab3"));
|
|
|
| - CHECK_EQ(3, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(3, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
| CHECK(HasArrayBufferInWeakList(isolate->heap(),
|
| *v8::Utils::OpenHandle(*ab1)));
|
| CHECK(HasArrayBufferInWeakList(isolate->heap(),
|
| @@ -156,7 +157,7 @@ TEST(WeakArrayBuffersFromScript) {
|
| CompileRun(source.start());
|
| isolate->heap()->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask);
|
|
|
| - CHECK_EQ(2, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(2, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
|
|
| {
|
| v8::HandleScope s2(context->GetIsolate());
|
| @@ -174,7 +175,7 @@ TEST(WeakArrayBuffersFromScript) {
|
| }
|
|
|
| isolate->heap()->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask);
|
| - CHECK_EQ(0, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(0, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
| }
|
| }
|
|
|
| @@ -266,6 +267,7 @@ static void TestTypedArrayFromScript(const char* constructor) {
|
| LocalContext context;
|
| Isolate* isolate = GetIsolateFrom(&context);
|
| v8::HandleScope scope(context->GetIsolate());
|
| + int start = CountArrayBuffersInWeakList(isolate->heap());
|
| CompileRun("var ab = new ArrayBuffer(2048);");
|
| for (int i = 1; i <= 3; i++) {
|
| // Create 3 typed arrays, make i-th of them garbage,
|
| @@ -273,7 +275,7 @@ static void TestTypedArrayFromScript(const char* constructor) {
|
| v8::HandleScope s0(context->GetIsolate());
|
| i::ScopedVector<char> source(2048);
|
|
|
| - CHECK_EQ(1, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(1, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
|
|
| {
|
| v8::HandleScope s1(context->GetIsolate());
|
| @@ -292,7 +294,7 @@ static void TestTypedArrayFromScript(const char* constructor) {
|
| v8::Handle<TypedArray>::Cast(CompileRun("ta2"));
|
| v8::Handle<TypedArray> ta3 =
|
| v8::Handle<TypedArray>::Cast(CompileRun("ta3"));
|
| - CHECK_EQ(1, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(1, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
| Handle<JSArrayBuffer> iab = v8::Utils::OpenHandle(*ab);
|
| CHECK_EQ(3, CountViews(*iab));
|
| CHECK(HasViewInWeakList(*iab, *v8::Utils::OpenHandle(*ta1)));
|
| @@ -304,7 +306,7 @@ static void TestTypedArrayFromScript(const char* constructor) {
|
| CompileRun(source.start());
|
| isolate->heap()->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask);
|
|
|
| - CHECK_EQ(1, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(1, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
|
|
| {
|
| v8::HandleScope s2(context->GetIsolate());
|
| @@ -324,7 +326,7 @@ static void TestTypedArrayFromScript(const char* constructor) {
|
| CompileRun("ta1 = null; ta2 = null; ta3 = null;");
|
| isolate->heap()->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask);
|
|
|
| - CHECK_EQ(1, CountArrayBuffersInWeakList(isolate->heap()));
|
| + CHECK_EQ(1, CountArrayBuffersInWeakList(isolate->heap()) - start);
|
|
|
| {
|
| v8::HandleScope s3(context->GetIsolate());
|
|
|