Index: runtime/vm/dart_api_impl_test.cc |
=================================================================== |
--- runtime/vm/dart_api_impl_test.cc (revision 20976) |
+++ runtime/vm/dart_api_impl_test.cc (working copy) |
@@ -6243,10 +6243,10 @@ |
} |
-static bool RunLoopTestCallback(const char* script_name, |
- const char* main, |
- void* data, |
- char** error) { |
+static Dart_Isolate RunLoopTestCallback(const char* script_name, |
+ const char* main, |
+ void* data, |
+ char** error) { |
const char* kScriptChars = |
"import 'builtin';\n" |
"import 'dart:isolate';\n" |
@@ -6282,7 +6282,10 @@ |
Dart_Handle lib = Dart_LoadScript(url, source, 0, 0); |
EXPECT_VALID(lib); |
Dart_ExitScope(); |
- return true; |
+ Dart_ExitIsolate(); |
+ bool retval = Dart_IsolateMakeRunnable(isolate); |
+ EXPECT(retval); |
+ return isolate; |
} |
@@ -6308,8 +6311,9 @@ |
Dart_IsolateCreateCallback saved = Isolate::CreateCallback(); |
Isolate::SetCreateCallback(RunLoopTestCallback); |
Isolate::SetUnhandledExceptionCallback(RunLoopUnhandledExceptionCallback); |
- RunLoopTestCallback(NULL, NULL, NULL, NULL); |
+ Dart_Isolate isolate = RunLoopTestCallback(NULL, NULL, NULL, NULL); |
+ Dart_EnterIsolate(isolate); |
Dart_EnterScope(); |
Dart_Handle lib = Dart_LookupLibrary(NewString(TestCase::url())); |
EXPECT_VALID(lib); |