| Index: test/cctest/test-debug.cc
|
| diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc
|
| index 66ff3838a3b0166e2f56f31d93a3acd7b3bf77b7..39210596b429012898e55b1650f008c76fa92b66 100644
|
| --- a/test/cctest/test-debug.cc
|
| +++ b/test/cctest/test-debug.cc
|
| @@ -5142,7 +5142,7 @@ void V8Thread::Run() {
|
| "\n"
|
| "foo();\n";
|
|
|
| - v8::V8::Initialize();
|
| + v8::Isolate::Scope isolate_scope(CcTest::isolate());
|
| DebugLocalContext env;
|
| v8::HandleScope scope(env->GetIsolate());
|
| v8::Debug::SetMessageHandler2(&ThreadedMessageHandler);
|
| @@ -5179,7 +5179,7 @@ void DebuggerThread::Run() {
|
| }
|
|
|
|
|
| -UNINITIALIZED_TEST(ThreadedDebugging) {
|
| +TEST(ThreadedDebugging) {
|
| DebuggerThread debugger_thread;
|
| V8Thread v8_thread;
|
|
|
| @@ -5258,9 +5258,10 @@ void BreakpointsV8Thread::Run() {
|
| const char* source_2 = "cat(17);\n"
|
| "cat(19);\n";
|
|
|
| - v8::V8::Initialize();
|
| + v8::Isolate* isolate = CcTest::isolate();
|
| + v8::Isolate::Scope isolate_scope(isolate);
|
| DebugLocalContext env;
|
| - v8::HandleScope scope(env->GetIsolate());
|
| + v8::HandleScope scope(isolate);
|
| v8::Debug::SetMessageHandler2(&BreakpointsMessageHandler);
|
|
|
| CompileRun(source_1);
|
| @@ -5333,6 +5334,7 @@ void BreakpointsDebuggerThread::Run() {
|
|
|
|
|
| v8::Isolate* isolate = CcTest::isolate();
|
| + v8::Isolate::Scope isolate_scope(isolate);
|
| // v8 thread initializes, runs source_1
|
| breakpoints_barriers->barrier_1.Wait();
|
| // 1:Set breakpoint in cat() (will get id 1).
|
| @@ -5403,12 +5405,12 @@ void TestRecursiveBreakpointsGeneric(bool global_evaluate) {
|
| }
|
|
|
|
|
| -UNINITIALIZED_TEST(RecursiveBreakpoints) {
|
| +TEST(RecursiveBreakpoints) {
|
| TestRecursiveBreakpointsGeneric(false);
|
| }
|
|
|
|
|
| -UNINITIALIZED_TEST(RecursiveBreakpointsGlobal) {
|
| +TEST(RecursiveBreakpointsGlobal) {
|
| TestRecursiveBreakpointsGeneric(true);
|
| }
|
|
|
| @@ -5789,7 +5791,7 @@ void HostDispatchV8Thread::Run() {
|
| "\n";
|
| const char* source_2 = "cat(17);\n";
|
|
|
| - v8::V8::Initialize();
|
| + v8::Isolate::Scope isolate_scope(CcTest::isolate());
|
| DebugLocalContext env;
|
| v8::HandleScope scope(env->GetIsolate());
|
|
|
| @@ -5832,7 +5834,7 @@ void HostDispatchDebuggerThread::Run() {
|
| }
|
|
|
|
|
| -UNINITIALIZED_TEST(DebuggerHostDispatch) {
|
| +TEST(DebuggerHostDispatch) {
|
| HostDispatchDebuggerThread host_dispatch_debugger_thread;
|
| HostDispatchV8Thread host_dispatch_v8_thread;
|
| i::FLAG_debugger_auto_break = true;
|
| @@ -5877,7 +5879,7 @@ static void DebugMessageHandler() {
|
|
|
|
|
| void DebugMessageDispatchV8Thread::Run() {
|
| - v8::V8::Initialize();
|
| + v8::Isolate::Scope isolate_scope(CcTest::isolate());
|
| DebugLocalContext env;
|
| v8::HandleScope scope(env->GetIsolate());
|
|
|
| @@ -5898,7 +5900,7 @@ void DebugMessageDispatchDebuggerThread::Run() {
|
| }
|
|
|
|
|
| -UNINITIALIZED_TEST(DebuggerDebugMessageDispatch) {
|
| +TEST(DebuggerDebugMessageDispatch) {
|
| DebugMessageDispatchDebuggerThread debug_message_dispatch_debugger_thread;
|
| DebugMessageDispatchV8Thread debug_message_dispatch_v8_thread;
|
|
|
| @@ -6363,13 +6365,13 @@ static void DebugEventDebugBreak(
|
|
|
| // Keep forcing breaks.
|
| if (break_point_hit_count < 20) {
|
| - v8::Debug::DebugBreak();
|
| + v8::Debug::DebugBreak(CcTest::isolate());
|
| }
|
| }
|
| }
|
|
|
|
|
| -UNINITIALIZED_TEST(RegExpDebugBreak) {
|
| +TEST(RegExpDebugBreak) {
|
| // This test only applies to native regexps.
|
| DebugLocalContext env;
|
| v8::HandleScope scope(env->GetIsolate());
|
| @@ -6805,7 +6807,7 @@ static void BreakMessageHandler(const v8::Debug::Message& message) {
|
|
|
| // Test that if DebugBreak is forced it is ignored when code from
|
| // debug-delay.js is executed.
|
| -UNINITIALIZED_TEST(NoDebugBreakInAfterCompileMessageHandler) {
|
| +TEST(NoDebugBreakInAfterCompileMessageHandler) {
|
| DebugLocalContext env;
|
| v8::HandleScope scope(env->GetIsolate());
|
|
|
| @@ -6813,7 +6815,7 @@ UNINITIALIZED_TEST(NoDebugBreakInAfterCompileMessageHandler) {
|
| v8::Debug::SetMessageHandler2(BreakMessageHandler);
|
|
|
| // Set the debug break flag.
|
| - v8::Debug::DebugBreak();
|
| + v8::Debug::DebugBreak(env->GetIsolate());
|
|
|
| // Create a function for testing stepping.
|
| const char* src = "function f() { eval('var x = 10;'); } ";
|
|
|