tools/test.dart: Add multitest support to Dart implementation of test runner.

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");
+
 
 interface TestSuite {
   void forEachTest(Function onTest, [Function onDone]);
 }
 
 
 class CCTestListerIsolate extends Isolate {
   CCTestListerIsolate() : super.heavy();
 
   void main() {
@@ skipping 160 matching lines @@
         !patterns.some((re) => re.hasMatch(filename))) {
       return;
     }
 
     int start = filename.lastIndexOf('src' + new Platform().pathSeparator());
     String testName = filename.substring(start + 4, filename.length - 5);
     Set<String> expectations = testExpectations.expectations(testName);
 
     if (expectations.contains(SKIP)) return;
 
+    var timeout = configuration['timeout'];
     var optionsFromFile = optionsFromFile(filename);
-    var isNegative = optionsFromFile['isNegative'];
-    var argumentLists = argumentListsFromFile(filename, optionsFromFile);
-    var timeout = configuration['timeout'];
 
-    for (var args in argumentLists) {
-      doTest(new TestCase(testName,
-                          shellPath,
-                          args,
-                          timeout,
-                          completeHandler,
-                          expectations,
-                          isNegative));
+    Function doTestBound(filename, isNegative, isNegativeIfChecked) {

[Mads Ager (google), 2011/11/29 08:12:04]

What does the 'Bound' part of this name mean? scheduleTest or something?

+      isNegative = isNegative ||
+          (configuration['checked'] && isNegativeIfChecked);
+      var argumentLists = argumentListsFromFile(filename, optionsFromFile);
+      for (var args in argumentLists) {
+        doTest(new TestCase(testName,
+                            shellPath,
+                            args,
+                            timeout,
+                            completeHandler,
+                            expectations,
+                            isNegative));
+      }
+    }
+
+
+    if (optionsFromFile['isMultitest']) {
+      DoMultitest(filename, doTestBound);
+    } else {
+      var isNegative = optionsFromFile['isNegative'];
+      doTestBound(filename, isNegative, false);
     }
   }
 
   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"];
+    List<List<String>> vmOptionsList = optionsFromFile["vmOptions"];
+    Expect.isTrue(!isMultitest || dartOptions == null);
     args.addAll(dartOptions == null ? [filename] : dartOptions);
 
     var result = new List<List<String>>();
-    List<List<String>> vmOptionsList = optionsFromFile["vmOptions"];
     if (vmOptionsList.isEmpty()) {

[Bill Hesse, 2011/11/28 15:29:47]

This if statement can be removed now.

       result.add(args);
     } else {
       for (var vmOptions in vmOptionsList) {
+        if (isMultitest) {
+          // Make copy of vmOptions, since we will modify it at each iteration.
+          vmOptions = new List<String>.from(vmOptions);
+        }
         vmOptions.addAll(args);
         result.add(vmOptions);
+        print("vmOptions added, filename = $filename");

[Mads Ager (google), 2011/11/29 08:12:04]

Remove debug printing.

       }
     }
 
     return result;
   }
 
   Map optionsFromFile(String filename) {
     RegExp testOptionsRegExp = const RegExp(@"// VMOptions=(.*)");
     RegExp dartOptionsRegExp = const RegExp(@"// DartOptions=(.*)");
 
@@ skipping 13 matching lines @@
 
     // Find the options in the file.
     List<List> result = new List<List>();
     List<String> dartOptions;
     bool isNegative = false;
 
     Iterable<Match> matches = testOptionsRegExp.allMatches(contents);
     for (var match in matches) {
       result.add(match[1].split(' ').filter((e) => e != ''));
     }
+    if (result.isEmpty()) result.add([]);
 
     matches = dartOptionsRegExp.allMatches(contents);
     for (var match in matches) {
       if (dartOptions != null) {
         throw new Exception(
             'More than one "// DartOptions=" line in test $filename');
       }
       dartOptions = match[1].split(' ').filter((e) => e != '');
     }
 
     if (contents.contains("@compile-error") ||
         contents.contains("@runtime-error")) {
       isNegative = true;
     } else if (contents.contains("@dynamic-type-error") &&
                configuration['checked']) {
       isNegative = true;
     }
 
+    bool isMultitest = contents.contains("///");
+
     return { "vmOptions": result,
              "dartOptions": dartOptions,
-             "isNegative" : isNegative };
+             "isNegative": isNegative,
+             "isMultitest": isMultitest};
   }
 }
 
 
 class TestUtils {
   static String executableName(Map configuration) {
     String postfix =
         (new Platform().operatingSystem() == 'windows') ? '.exe' : '';
     switch (configuration['component']) {
       case 'vm':
@@ skipping 42 matching lines @@
       args.add("--enable_leg");
     }
     if (configuration["component"] == "dartc") {
       if (configuration["mode"] == "release") {
         args.add("--optimize");
       }
     }
     return args;
   }
 }