tools/test.dart: Add synchronization, so the process queue knows when all multitests are done.

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 110 matching lines @@
   }
 }
 
 
 class StandardTestSuite implements TestSuite {
   Map configuration;
   String directoryPath;
   List<String> statusFilePaths;
   Function doTest;
   Function doDone;
+  int activeMultitests = 0;
+  bool listingDone = false;
   String shellPath;
   TestExpectations testExpectations;
 
   StandardTestSuite(Map this.configuration,
                     String this.directoryPath,
                     List<String> this.statusFilePaths) {
     shellPath = TestUtils.dartShellFileName(configuration) ;
   }
 
 
   void isTestFile(String filename) => filename.endsWith("Test.dart");
 
   void listRecursively() => false;
 
   void complexStatusMatching() => false;
 
   void forEachTest(Function onTest, [Function onDone = null]) {
     doTest = onTest;
-    doDone = (ignore) => (onDone != null) ? onDone() : null;
+    doDone = (onDone != null) ? onDone : (() => null);
 
     // Read test expectations from status files.
     testExpectations =
         new TestExpectations(complexMatching: complexStatusMatching());
     for (var statusFilePath in statusFilePaths) {
       ReadTestExpectationsInto(testExpectations,
                                statusFilePath,
                                configuration);
     }
 
     processDirectory();
   }
 
   void processDirectory() {
     directoryPath = getDirname(directoryPath);
     Directory dir = new Directory(directoryPath);
     dir.errorHandler = (s) {
       throw s;
     };
     dir.fileHandler = processFile;
-    dir.doneHandler = doDone;
+    dir.doneHandler = directoryListingDone;
     dir.list(recursive: listRecursively());
   }
 
   void processFile(String filename) {
     if (!isTestFile(filename)) return;
 
     // If patterns are given only list the files that match one of the
     // patterns.
     var patterns = configuration['patterns'];
     if (!patterns.isEmpty() &&
@@ skipping 34 matching lines @@
                             args,
                             timeout,
                             completeHandler,
                             expectations,
                             isNegative));
       }
     }
 
 
     if (optionsFromFile['isMultitest']) {
+      ++activeMultitests;
       DoMultitest(filename,
                   TestUtils.buildDir(configuration),
                   directoryPath,
-                  createTestCase);
+                  createTestCase,
+                  multitestDone);
     } else {
       createTestCase(filename, optionsFromFile['isNegative']);
     }
   }
 
+  void multitestDone() {
+    --activeMultitests;
+    if (activeMultitests == 0 && listingDone) {
+      doDone();
+    }
+  }
+
+  void directoryListingDone(ignore) {
+    listingDone = true;
+    if (activeMultitests == 0 && listingDone) {

[Mads Ager (google), 2011/12/01 11:50:47]

You don't need to check for listingDone here.

+      doDone();
+    }
+  }
+
   void completeHandler(TestCase testCase) {
   }
 
 
   List<List<String>> argumentListsFromFile(String filename,
                                            Map optionsFromFile) {
     List args = TestUtils.standardOptions(configuration);
 
     bool isMultitest = optionsFromFile["isMultitest"];
     List<String> dartOptions = optionsFromFile["dartOptions"];
@@ skipping 122 matching lines @@
       args.add("--enable_leg");
     }
     if (configuration["component"] == "dartc") {
       if (configuration["mode"] == "release") {
         args.add("--optimize");
       }
     }
     return args;
   }
 }