Improve the event handling for string input stream

tools/testing/dart/test_suite.dart

 // 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.
 
 #library("test_suite");
 
 #import("status_file_parser.dart");
 #import("test_runner.dart");
 #import("multitest.dart");
 
@@ skipping 85 matching lines @@
                           expectations));
 
       receiveTestName.receive(testNameHandler);
     }
   }
 
   void forEachTest(Function onTest, Map testCache, [Function onDone]) {
     doTest = onTest;
     doDone = (ignore) => (onDone != null) ? onDone() : null;
 
+    var filesRead = 0;
+    void statusFileRead() {
+      filesRead++;
+      if (filesRead == statusFilePaths.length) {
+        receiveTestName = new ReceivePort();
+        new CCTestListerIsolate().spawn().then((port) {
+            port.send(runnerPath, receiveTestName.toSendPort());
+            receiveTestName.receive(testNameHandler);
+        });
+      }
+    }
+
     testExpectations =
         new TestExpectations(complexMatching: complexStatusMatching());
     for (var statusFilePath in statusFilePaths) {
       ReadTestExpectationsInto(testExpectations,
                                statusFilePath,
-                               configuration);
+                               configuration,
+                               statusFileRead);
     }
-
-    receiveTestName = new ReceivePort();
-    new CCTestListerIsolate().spawn().then((port) {
-        port.send(runnerPath, receiveTestName.toSendPort());
-        receiveTestName.receive(testNameHandler);
-    });
   }
 
   void completeHandler(TestCase testCase) {
   }
 }
 
 
 class TestInformation {
   String filename;
   Map optionsFromFile;
@@ skipping 30 matching lines @@
   void complexStatusMatching() => false;
 
   String shellPath() => TestUtils.dartShellFileName(configuration);
 
   List<String> additionalOptions() => [];
 
   void forEachTest(Function onTest, Map testCache, [Function onDone = null]) {
     doTest = onTest;
     doDone = (onDone != null) ? onDone : (() => null);
 
+    var filesRead = 0;
+    void statusFileRead() {
+      filesRead++;
+      if (filesRead == statusFilePaths.length) {
+        // Checked if we have already found and generated the tests for
+        // this suite.
+        if (!testCache.containsKey(suiteName)) {
+          cachedTests = testCache[suiteName] = [];
+          processDirectory();
+        } else {
+          // We rely on enqueueing completing asynchronously so use a
+          // timer to make it so.
+          void enqueueCachedTests(Timer ignore) {
+            for (var info in testCache[suiteName]) {
+              enqueueTestCaseFromTestInformation(info);
+            }
+            doDone();
+          }
+          new Timer(enqueueCachedTests, 0, false);
+        }
+      }
+    }
+
     // Read test expectations from status files.
     testExpectations =
         new TestExpectations(complexMatching: complexStatusMatching());
     for (var statusFilePath in statusFilePaths) {
       ReadTestExpectationsInto(testExpectations,
                                statusFilePath,
-                               configuration);
-    }
-
-    // Checked if we have already found and generated the tests for
-    // this suite.
-    if (!testCache.containsKey(suiteName)) {
-      cachedTests = testCache[suiteName] = [];
-      processDirectory();
-    } else {
-      // We rely on enqueueing completing asynchronously so use a
-      // timer to make it so.
-      void enqueueCachedTests(Timer ignore) {
-        for (var info in testCache[suiteName]) {
-          enqueueTestCaseFromTestInformation(info);
-        }
-        doDone();
-      }
-      new Timer(enqueueCachedTests, 0, false);
+                               configuration,
+                               statusFileRead);
     }
   }
 
   void processDirectory() {
     directoryPath = getDirname(directoryPath);
     Directory dir = new Directory(directoryPath);
     dir.errorHandler = (s) {
       throw s;
     };
     dir.fileHandler = processFile;
@@ skipping 389 matching lines @@
  * $noCrash tests are expected to be flaky but not crash
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout\
 """;
     print(report);
   }
 }