Synced basic_debugger_test start on new "debugger initialized" message.

tests/standalone/debugger/debug_lib.dart

 // Copyright (c) 2013, 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.
 
 // Library used by debugger wire protocol tests (standalone VM debugging).
 
 library DartDebugger;
 
 import "dart:io";
 import "dart:math";
 import "dart:utf";
 import "dart:json" as JSON;
 
-// Whether or not to print debug target process on the console.
-var showDebuggeeOutput = true;
-
 // Whether or not to print the debugger wire messages on the console.
 var verboseWire = false;
 
 // The number of attempts made to find an unused debugger port.
 var retries = 0;
 
 // Class to buffer wire protocol data from debug target and
 // break it down to individual json messages.
 class JsonBuffer {
   String buffer = null;
@@ skipping 259 matching lines @@
   Command lastCommand = null;  // Most recent command sent to target.
   List<String> errors = new List();
 
   // Data collected from debug target.
   Map currentMessage = null;  // Currently handled message sent by target.
   String scriptUrl = null;
   bool shutdownEventSeen = false;
   int isolateId = 0;
   bool isPaused = false;
 
-  Debugger(this.targetProcess, this.portNumber) {
+  Debugger(this.targetProcess, this.portNumber, this.script) {
     stdin.listen((_) {});
     var stdoutStringStream = targetProcess.stdout
         .transform(new StringDecoder())
         .transform(new LineTransformer());
+    var started = false;
     stdoutStringStream.listen((line) {
-      if (showDebuggeeOutput) {
+      if (!started) {
+        // Debuggee initialized message received.
+        started = true;
+        openConnection();
+      } else {
         print("TARG: $line");
       }

[kustermann, 2013/04/05 08:20:08]

I'd actually test if 'line == "Debugger initialized"' -- in case somebody else
adds another OS::Print statement which is executed earlier, we could end up
calling 'openConnection' before the debuggee is ready.

Additionally, I think it wouldn't hurt if we print the "Debugger initialized"
message (as we do with all other stdout/stderr lines).

[Tom Ball, 2013/04/05 21:28:52]

Done.
It was being displayed twice, because a debugger is initialized for each
isolate. I moved the initialized message to main.cc, and removed this test.

     });
 
     var stderrStringStream = targetProcess.stderr
         .transform(new StringDecoder())
         .transform(new LineTransformer());
     stderrStringStream.listen((line) {
-      if (showDebuggeeOutput) {
-        print("TARG: $line");
-      }
+      print("TARG: $line");
     });
   }
 
   // Handle debugger events, updating the debugger state.
   void handleEvent(Map<String,dynamic> msg) {
     if (msg["event"] == "isolate") {
       if (msg["params"]["reason"] == "created") {
         isolateId = msg["params"]["id"];
         assert(isolateId != null);
         print("Debuggee isolate id $isolateId created.");
@@ skipping 114 matching lines @@
           onDone: () {
             print("Connection closed by debug target");
             close(killDebugee: true);
           },
           onError: (e) {
             print("Error '$e' detected in input stream from debug target");
             close(killDebugee: true);
           });
       },
       onError: (asyncErr) {
         print("Error while connecting to debugee: $asyncErr");

[kustermann, 2013/04/05 08:20:08]

Would be nice if you could change that from
  print("Error while connecting to debugee: $asyncErr");
to
  error("Error while connecting to debugee: $asyncErr");
otherwise the test will be reported as passing even if it couldn't connect to
the debuggee.

[Tom Ball, 2013/04/05 21:28:52]

Done.

         close(killDebugee: true);
       });
   }
 
   void close({killDebugee: false}) {
     if (errorsDetected) {
       for (int i = 0; i < errors.length; i++) print(errors[i]);
     }
     if (socket != null) socket.close();
     if (killDebugee) {
       targetProcess.kill();
       print("Target process killed");
     }
     Expect.isTrue(!errorsDetected);
     exit(errors.length);
   }
 }
 
 
 bool RunScript(List script) {
   var options = new Options();
   if (options.arguments.contains("--debuggee")) {
     return false;
   }
-  // The default is to show debugging output.
-  showDebuggeeOutput = !options.arguments.contains("--non-verbose");
   verboseWire = options.arguments.contains("--wire");
   
   // Pick a port in the upper half of the port number range.
   var seed = new DateTime.now().millisecondsSinceEpoch;
   Random random = new Random(seed);
   var debugPort = random.nextInt(32000) + 32000;
   print('using debug port $debugPort ...');
   ServerSocket.bind('127.0.0.1', debugPort).then((ServerSocket s) {
       s.close();
       var targetOpts = [ "--debug:$debugPort" ];
-      if (showDebuggeeOutput) targetOpts.add("--verbose_debug");
+      // --verbose_debug is necessary so the test knows when the debuggee
+      // is initialized.
+      targetOpts.add("--verbose_debug");
       targetOpts.add(options.script);
       targetOpts.add("--debuggee");
 
       Process.start(options.executable, targetOpts).then((Process process) {
         print("Debug target process started");
         process.stdin.close();
         process.exitCode.then((int exitCode) {
           Expect.equals(0, exitCode);
           print("Debug target process exited with exit code $exitCode");
         });
-        var debugger = new Debugger(process, debugPort);
-        debugger.runScript(script);
+        var debugger =
+            new Debugger(process, debugPort, new DebugScript(script));
       });
     },
     onError: (e) {
       if (++retries >= 3) { 
         print('unable to find unused port: $e');
         return -1; 
       } else {
         // Retry with another random port.
         RunScript(script);
       }
     });
   return true;
 }