Re-enable VM isolate tests.

runtime/vm/custom_isolate_test.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "vm/unit_test.h"
 
 // Custom Isolate Test.
 //
 // This mid-size test uses the Dart Embedding Api to create a custom
 // isolate abstraction.  Instead of having a dedicated thread for each
 // isolate, as is the case normally, this implementation shares a
 // single thread among the isolates using an event queue.
 
 namespace dart {
 
 static void native_echo(Dart_NativeArguments args);
 static void CustomIsolateImpl_start(Dart_NativeArguments args);
 static Dart_NativeFunction NativeLookup(Dart_Handle name, int argc);
 
 
 static const char* kCustomIsolateScriptChars =
-    "import 'dart:async';\n"
     "import 'dart:isolate';\n"
     "\n"
     "ReceivePort mainPort;\n"
     "\n"
     "echo(arg) native \"native_echo\";\n"
     "\n"
     "class CustomIsolateImpl implements CustomIsolate {\n"
     "  CustomIsolateImpl(String entry) : _entry = entry{\n"
     "    echo('Constructing isolate');\n"
     "  }\n"
     "\n"
-    "  Future<SendPort> spawn() {\n"
-    "    Completer<SendPort> completer = new Completer<SendPort>();\n"
-    "    SendPort port = _start(_entry);\n"
-    "    completer.complete(port);\n"
-    "    return completer.future;\n"
+    "  SendPort spawn() {\n"
+    "    return _start(_entry);\n"
     "  }\n"
     "\n"
     "  static SendPort _start(entry)\n"
     "      native \"CustomIsolateImpl_start\";\n"
     "\n"
     "  String _entry;\n"
     "}\n"
     "\n"
     "abstract class CustomIsolate {\n"
     "  factory CustomIsolate(String entry) = CustomIsolateImpl;\n"
     "\n"
-    "  Future<SendPort> spawn();\n"
+    "  SendPort spawn();\n"
     "}\n"
     "\n"
     "isolateMain() {\n"
     "   echo('Running isolateMain');\n"
     "   mainPort.receive((message, SendPort replyTo) {\n"
     "     echo('Received: $message');\n"
     "     replyTo.send((message + 1), null);\n"
     "   });\n"
     "}\n"
     "\n"
     "main() {\n"
     "  var isolate = new CustomIsolate(\"isolateMain\");\n"
-    "  isolate.spawn().then((SendPort port) {\n"
-    "    port.call(42).then((message) {\n"
-    "      echo('Received: $message');\n"
-    "    });\n"
+    "  var receivePort = new ReceivePort();\n"
+    "  SendPort port = isolate.spawn();\n"
+    "  port.send(42, receivePort.toSendPort());\n"
+    "  receivePort.receive((message, _) {\n"
+    "    receivePort.close();\n"
+    "    echo('Received: $message');\n"
     "  });\n"
     "  return 'success';\n"
     "}\n";
 
 
 // An entry in our event queue.
 class Event {
  protected:
   explicit Event(Dart_Isolate isolate) : isolate_(isolate), next_(NULL) {}
 
@@ skipping 87 matching lines @@
   Dart_EnterIsolate(isolate());
   Dart_EnterScope();
   Dart_Handle result;
 
   // Reload all the test classes here.
   //
   // TODO(turnidge): Use the create isolate callback instead?
   Dart_Handle lib = TestCase::LoadTestScript(kCustomIsolateScriptChars,
                                              NativeLookup);
   EXPECT_VALID(lib);
-  EXPECT_VALID(Dart_CompileAll());

[Ivan Posva, 2013/09/25 20:23:46]

Why did you remove the Dart_CompileAll call?

We do have these in certain situations to make sure all of the code loaded into
the VM is parseable.

[Anders Johnsen, 2013/09/26 14:19:33]

I removed it because it complained about the native Logger_PrintString not being
available. How should I go about adding that? I tried adding it to NativeLookup,
but without much success.

 
   Dart_Handle recv_port = Dart_GetReceivePort(Dart_GetMainPortId());
   EXPECT_VALID(recv_port);
   result = Dart_SetField(lib, NewString("mainPort"), recv_port);
   EXPECT_VALID(result);
 
   result = Dart_Invoke(lib, NewString(main_), 0, NULL);
   EXPECT_VALID(result);
   free(const_cast<char*>(main_));
   main_ = NULL;
@@ skipping 146 matching lines @@
     event = event_queue->Get();
   }
   OS::Print("-- Finished event loop --\n");
   EXPECT_STREQ("Received: 43", saved_echo);
   free(const_cast<char*>(saved_echo));
 
   delete event_queue;
 }
 
 }  // namespace dart