diff options
| author | Michaël Zasso <mic.besace@gmail.com> | 2015-10-06 08:42:38 +0200 |
|---|---|---|
| committer | Ali Ijaz Sheikh <ofrobots@google.com> | 2015-10-14 11:20:34 -0700 |
| commit | d8011d1683fe0d977de2bea1147f5213d4490c5a (patch) | |
| tree | 54967df8dc1732e59eef39e5c5b39fe99ad88977 /deps/v8/test/cctest/cctest.cc | |
| parent | d1a2e5357ef0357cec9b516fa9ac78cc38a984aa (diff) | |
| download | android-node-v8-d8011d1683fe0d977de2bea1147f5213d4490c5a.tar.gz android-node-v8-d8011d1683fe0d977de2bea1147f5213d4490c5a.tar.bz2 android-node-v8-d8011d1683fe0d977de2bea1147f5213d4490c5a.zip | |
deps: upgrade V8 to 4.6.85.23
PR-URL: https://github.com/nodejs/node/pull/3351
Reviewed-By: indutny - Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/test/cctest/cctest.cc')
| -rw-r--r-- | deps/v8/test/cctest/cctest.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/deps/v8/test/cctest/cctest.cc b/deps/v8/test/cctest/cctest.cc index 851096ddce..72be29c383 100644 --- a/deps/v8/test/cctest/cctest.cc +++ b/deps/v8/test/cctest/cctest.cc @@ -29,7 +29,7 @@ #include "test/cctest/cctest.h" #include "include/libplatform/libplatform.h" -#include "src/debug.h" +#include "src/debug/debug.h" #include "test/cctest/print-extension.h" #include "test/cctest/profiler-extension.h" #include "test/cctest/trace-extension.h" @@ -93,6 +93,12 @@ void CcTest::Run() { } callback_(); if (initialize_) { + if (v8::Locker::IsActive()) { + v8::Locker locker(isolate_); + EmptyMessageQueues(isolate_); + } else { + EmptyMessageQueues(isolate_); + } isolate_->Exit(); } } @@ -132,7 +138,10 @@ static void PrintTestList(CcTest* current) { class CcTestArrayBufferAllocator : public v8::ArrayBuffer::Allocator { - virtual void* Allocate(size_t length) { return malloc(length); } + virtual void* Allocate(size_t length) { + void* data = AllocateUninitialized(length); + return data == NULL ? data : memset(data, 0, length); + } virtual void* AllocateUninitialized(size_t length) { return malloc(length); } virtual void Free(void* data, size_t length) { free(data); } // TODO(dslomov): Remove when v8:2823 is fixed. |