Index: test/cctest/test-debug.cc |
diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc |
index 2a2ca3e7cfd46b151742d307ea646432598b718e..49f45794a033e8c9978a5db8092745882f951364 100644 |
--- a/test/cctest/test-debug.cc |
+++ b/test/cctest/test-debug.cc |
@@ -98,10 +98,11 @@ class DebugLocalContext { |
v8::internal::Isolate* isolate = |
reinterpret_cast<v8::internal::Isolate*>(context_->GetIsolate()); |
v8::internal::Factory* factory = isolate->factory(); |
- v8::internal::Debug* debug = isolate->debug(); |
// Expose the debug context global object in the global object for testing. |
- debug->Load(); |
- debug->debug_context()->set_security_token( |
+ CHECK(isolate->debug()->Load()); |
+ Handle<v8::internal::Context> debug_context = |
+ isolate->debug()->debug_context(); |
+ debug_context->set_security_token( |
v8::Utils::OpenHandle(*context_)->security_token()); |
Handle<JSGlobalProxy> global(Handle<JSGlobalProxy>::cast( |
@@ -109,7 +110,7 @@ class DebugLocalContext { |
Handle<v8::internal::String> debug_string = |
factory->InternalizeOneByteString(STATIC_ASCII_VECTOR("debug")); |
v8::internal::Runtime::SetObjectProperty(isolate, global, debug_string, |
- Handle<Object>(debug->debug_context()->global_proxy(), isolate), |
+ Handle<Object>(debug_context->global_proxy(), isolate), |
DONT_ENUM, |
::v8::internal::SLOPPY).Check(); |
} |
@@ -421,12 +422,6 @@ void CheckDebuggerUnloaded(bool check_functions) { |
} |
-void ForceUnloadDebugger() { |
- CcTest::i_isolate()->debugger()->never_unload_debugger_ = false; |
- CcTest::i_isolate()->debugger()->UnloadDebugger(); |
-} |
- |
- |
} } // namespace v8::internal |
@@ -5500,13 +5495,12 @@ static void CheckDataParameter( |
v8::String::NewFromUtf8(args.GetIsolate(), "Test"); |
CHECK(v8::Debug::Call(debugger_call_with_data, data)->IsString()); |
- CHECK(v8::Debug::Call(debugger_call_with_data).IsEmpty()); |
- CHECK(v8::Debug::Call(debugger_call_with_data).IsEmpty()); |
- |
- v8::TryCatch catcher; |
- v8::Debug::Call(debugger_call_with_data); |
- CHECK(catcher.HasCaught()); |
- CHECK(catcher.Exception()->IsString()); |
+ for (int i = 0; i < 3; i++) { |
+ v8::TryCatch catcher; |
+ CHECK(v8::Debug::Call(debugger_call_with_data).IsEmpty()); |
+ CHECK(catcher.HasCaught()); |
+ CHECK(catcher.Exception()->IsString()); |
+ } |
} |
@@ -6872,9 +6866,12 @@ TEST(CallingContextIsNotDebugContext) { |
TEST(DebugContextIsPreservedBetweenAccesses) { |
v8::HandleScope scope(CcTest::isolate()); |
+ v8::Debug::SetDebugEventListener(DebugEventBreakPointHitCount); |
v8::Local<v8::Context> context1 = v8::Debug::GetDebugContext(); |
v8::Local<v8::Context> context2 = v8::Debug::GetDebugContext(); |
- CHECK_EQ(*context1, *context2); |
+ CHECK(v8::Utils::OpenHandle(*context1).is_identical_to( |
+ v8::Utils::OpenHandle(*context2))); |
+ v8::Debug::SetDebugEventListener(NULL); |
} |