Change Process.start to return a future that completes with a

utils/testrunner/layout_test_controller.dart

 // Copyright (c) 2012, 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.
 
 // The following set of variables should be set by the caller that
 // #sources this file.
 /** Whether to include elapsed time. */
 
 part of test_controller;
 
@@ skipping 110 matching lines @@
   if (summarize) {
     printSummary(testfile, passCount, failCount, errorCount);
   }
   notifyDone(failCount > 0 ? -1 : 0);
 }
 
 runTextLayoutTest(testNum) {
   var url = '$baseUrl?test=$testNum';
   var stdout = new List();
   start = new Date.now();
-  var process = Process.start(drt, [url]);
-  StringInputStream stdoutStringStream = new StringInputStream(process.stdout);
-  stdoutStringStream.onLine = () {
-    if (stdoutStringStream.closed) return;
-    var line = stdoutStringStream.readLine();
-    while (null != line) {
-      stdout.add(line);
-      line = stdoutStringStream.readLine();
-    }
-  };
-  process.onExit = (exitCode) {
-    process.close();
-    if (stdout.length > 0 && stdout[stdout.length-1].startsWith('#EOF')) {
-      stdout.removeLast();
-    }
-    var done = false;
-    var i = 0;
-    var label = null;
-    var labelMarker = 'CONSOLE MESSAGE: #TEST ';
-    var contentMarker = 'layer at ';
-    while (i < stdout.length) {
-      if (label == null && stdout[i].startsWith(labelMarker)) {
-        label = stdout[i].substring(labelMarker.length);
-        if (label == 'NONEXISTENT') {
-          complete();
-        }
-      } else if (stdout[i].startsWith(contentMarker)) {
-        if (label == null) {
-          complete();
-        }
-        var expectedFileName =
-            '$sourceDir${Platform.pathSeparator}'
-            '${label.replaceAll("###", "_")
-                     .replaceAll(const RegExp("[^A-Za-z0-9]"),"_")}.txt';
-        var expected = new File(expectedFileName);
-        if (regenerate) {
-          var ostream = expected.openOutputStream(FileMode.WRITE);
-          while (i < stdout.length) {
-            ostream.writeString(stdout[i]);
-            ostream.writeString('\n');
-            i++;
+  Process.start(drt, [url]).then((process) {
+    StringInputStream stdoutStringStream =
+        new StringInputStream(process.stdout);
+    stdoutStringStream.onLine = () {
+      if (stdoutStringStream.closed) return;
+      var line = stdoutStringStream.readLine();
+      while (null != line) {
+        stdout.add(line);
+        line = stdoutStringStream.readLine();
+      }
+    };
+    process.onExit = (exitCode) {
+      process.close();
+      if (stdout.length > 0 && stdout[stdout.length-1].startsWith('#EOF')) {
+        stdout.removeLast();
+      }
+      var done = false;
+      var i = 0;
+      var label = null;
+      var labelMarker = 'CONSOLE MESSAGE: #TEST ';
+      var contentMarker = 'layer at ';
+      while (i < stdout.length) {
+        if (label == null && stdout[i].startsWith(labelMarker)) {
+          label = stdout[i].substring(labelMarker.length);
+          if (label == 'NONEXISTENT') {
+            complete();
           }
-          ostream.close();
-          pass(start, label);
-        } else if (!expected.existsSync()) {
-          fail(start, label, 'No expectation file');
-        } else {
-          var lines = expected.readAsLinesSync();
-          var actualLength = stdout.length - i;
-          var compareCount = min(lines.length, actualLength);
-          var match = true;
-          for (var j = 0; j < compareCount; j++) {
-            if (lines[j] != stdout[i + j]) {
-              fail(start, label, 'Expectation differs at line ${j + 1}');
-              match = false;
-              break;
+        } else if (stdout[i].startsWith(contentMarker)) {
+          if (label == null) {
+            complete();
+          }
+          var expectedFileName =
+              '$sourceDir${Platform.pathSeparator}'
+              '${label.replaceAll("###", "_")
+                       .replaceAll(const RegExp("[^A-Za-z0-9]"),"_")}.txt';

[ricow1, 2012/10/11 17:27:34]

indentaion seems random

[Emily Fortuna, 2012/10/11 18:23:08]

just -1 space

[Mads Ager (google), 2012/10/12 08:44:46]

Done. It was off in the original too.

+          var expected = new File(expectedFileName);
+          if (regenerate) {
+            var ostream = expected.openOutputStream(FileMode.WRITE);
+            while (i < stdout.length) {
+              ostream.writeString(stdout[i]);
+              ostream.writeString('\n');
+              i++;
+            }
+            ostream.close();
+            pass(start, label);
+          } else if (!expected.existsSync()) {
+            fail(start, label, 'No expectation file');
+          } else {
+            var lines = expected.readAsLinesSync();
+            var actualLength = stdout.length - i;
+            var compareCount = min(lines.length, actualLength);
+            var match = true;
+            for (var j = 0; j < compareCount; j++) {
+              if (lines[j] != stdout[i + j]) {
+                fail(start, label, 'Expectation differs at line ${j + 1}');
+                match = false;
+                break;
+              }
+            }
+            if (match) {
+              if (lines.length != actualLength) {
+                fail(start, label, 'Expectation file has wrong length');
+              } else {
+                pass(start, label);
+              }
             }
           }
-          if (match) {
-            if (lines.length != actualLength) {
-              fail(start, label, 'Expectation file has wrong length');
-            } else {
-              pass(start, label);
-            }
-          }
+          done = true;
+          break;
         }
-        done = true;
-        break;
+        i++;
       }
-      i++;
-    }
-    if (label != null) {
-      if (!done) error(start, label, 'Failed to parse output');
-      runTextLayoutTest(testNum + 1);
-    }
-  };
+      if (label != null) {
+        if (!done) error(start, label, 'Failed to parse output');
+        runTextLayoutTest(testNum + 1);
+      }
+    };
+  });
 }
 
 runPixelLayoutTest(int testNum) {
   var url = '$baseUrl?test=$testNum';
   var stdout = new List();
   start = new Date.now();
-  var process = Process.start(drt, ["$url'-p"]);
-  ListInputStream stdoutStream = process.stdout;
-  stdoutStream.onData = () {
-    if (!stdoutStream.closed) {
-      var data = stdoutStream.read();
-      stdout.addAll(data);
-    }
-  };
-  stdoutStream.onError = (e) {
-    print(e);
-  };
-  process.onExit = (exitCode) {
-    stdout.addAll(process.stdout.read());
-    process.close();
-    var labelMarker = 'CONSOLE MESSAGE: #TEST ';
-    var contentMarker = 'Content-Length: ';
-    var eol = '\n'.charCodeAt(0);
-    var pos = -1;
-    var label = null;
-    var done = false;
+  Process.start(drt, ["$url'-p"]).then((process) {
+    ListInputStream stdoutStream = process.stdout;
+    stdoutStream.onData = () {
+      if (!stdoutStream.closed) {
+        var data = stdoutStream.read();
+        stdout.addAll(data);
+      }
+    };
+    stdoutStream.onError = (e) {
+      print(e);
+    };
+    process.onExit = (exitCode) {
+      stdout.addAll(process.stdout.read());
+      process.close();
+      var labelMarker = 'CONSOLE MESSAGE: #TEST ';
+      var contentMarker = 'Content-Length: ';
+      var eol = '\n'.charCodeAt(0);
+      var pos = -1;
+      var label = null;
+      var done = false;
 
-    while(pos < stdout.length) {
-      var idx = stdout.indexOf(eol, ++pos);
-      if (idx < 0) break;
-      StringBuffer sb = new StringBuffer();
-      for (var i = pos; i < idx; i++) {
-        sb.addCharCode(stdout[i]);
+      while(pos < stdout.length) {
+        var idx = stdout.indexOf(eol, ++pos);
+        if (idx < 0) break;
+        StringBuffer sb = new StringBuffer();
+        for (var i = pos; i < idx; i++) {
+          sb.addCharCode(stdout[i]);
+        }
+        var line = sb.toString();
+
+        if (label == null && line.startsWith(labelMarker)) {
+          label = line.substring(labelMarker.length);
+          if (label == 'NONEXISTENT') {
+            complete();
+          }
+        } else if (line.startsWith(contentMarker)) {
+          if (label == null) {
+            complete();
+          }
+          var len = int.parse(line.substring(contentMarker.length));
+          pos = idx + 1;
+          var expectedFileName =
+              '$sourceDir${Platform.pathSeparator}'
+              '${label.replaceAll("###","_").
+                       replaceAll(const RegExp("[^A-Za-z0-9]"),"_")}.png';
+          var expected = new File(expectedFileName);
+          if (regenerate) {
+            var ostream = expected.openOutputStream(FileMode.WRITE);
+            ostream.writeFrom(stdout, pos, len);
+            ostream.close();
+            pass(start, label);
+          } else if (!expected.existsSync()) {
+            fail(start, label, 'No expectation file');
+          } else {
+            var bytes = expected.readAsBytesSync();
+            if (bytes.length != len) {
+              fail(start, label, 'Expectation file has wrong length');
+            } else {
+              var match = true;
+              for (var j = 0; j < len; j++) {
+                if (bytes[j] != stdout[pos + j]) {
+                  fail(start, label, 'Expectation differs at byte ${j + 1}');
+                  match = false;
+                  break;
+                }
+              }
+              if (match) pass(start, label);
+            }
+          }
+          done = true;
+          break;
+        }
+        pos = idx;
       }
-      var line = sb.toString();
-
-      if (label == null && line.startsWith(labelMarker)) {
-        label = line.substring(labelMarker.length);
-        if (label == 'NONEXISTENT') {
-          complete();
-        }
-      } else if (line.startsWith(contentMarker)) {
-        if (label == null) {
-          complete();
-        }
-        var len = int.parse(line.substring(contentMarker.length));
-        pos = idx + 1;
-        var expectedFileName =
-            '$sourceDir${Platform.pathSeparator}'
-            '${label.replaceAll("###","_").
-                     replaceAll(const RegExp("[^A-Za-z0-9]"),"_")}.png';
-        var expected = new File(expectedFileName);
-        if (regenerate) {
-          var ostream = expected.openOutputStream(FileMode.WRITE);
-          ostream.writeFrom(stdout, pos, len);
-          ostream.close();
-          pass(start, label);
-        } else if (!expected.existsSync()) {
-          fail(start, label, 'No expectation file');
-        } else {
-          var bytes = expected.readAsBytesSync();
-          if (bytes.length != len) {
-            fail(start, label, 'Expectation file has wrong length');
-          } else {
-            var match = true;
-            for (var j = 0; j < len; j++) {
-              if (bytes[j] != stdout[pos + j]) {
-                fail(start, label, 'Expectation differs at byte ${j + 1}');
-                match = false;
-                break;
-              }
-            }
-            if (match) pass(start, label);
-          }
-        }
-        done = true;
-        break;
+      if (label != null) {
+        if (!done) error(start, label, 'Failed to parse output');
+        runPixelLayoutTest(testNum + 1);
       }
-      pos = idx;
-    }
-    if (label != null) {
-      if (!done) error(start, label, 'Failed to parse output');
-      runPixelLayoutTest(testNum + 1);
-    }
-  };
+    };
+  });
 }
 
 void init() {
   // Get the name of the directory that has the expectation files
   // (by stripping .dart suffix from test file path).
   // Create it if it does not exist.
   sourceDir = testfile.substring(0, testfile.length - 5);
   if (regenerate) {
     var d = new Directory(sourceDir);
     if (!d.existsSync()) {
       d.createSync();
     }
   }
 }
 
 void runPixelLayoutTests() {
   init();
   runPixelLayoutTest(0);
 }
 
 void runTextLayoutTests() {
   init();
   runTextLayoutTest(0);
 }