Add in-process http server to the dart test scripts.

tools/testing/dart/test_suite.dart

Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index b2f25ee741b3424e3b03e78c8fd39f14c600fd41..09078327724ee22e6d89758f22d6c888fda1d6bb 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -445,20 +445,11 @@ class StandardTestSuite implements TestSuite {
     List<List<String>> vmOptionsList = getVmOptions(info.optionsFromFile);
     Expect.isFalse(vmOptionsList.isEmpty(), "empty vmOptionsList");
 
-    // Check for an "ExtraCommand" comment from the file, and generate
-    // a command for it, if needed.
-    var optionsFromFile = info.optionsFromFile;
-    var commands = [];
-    var command = optionsFromFile['extraCommand'];
-    var args = optionsFromFile['extraCommandArgs'];
-    addExtraCommand(command, args, commands);
-
     List _append(list1,list2) => []..addAll(list1)..addAll(list2);

[ahe, 2012/10/04 10:06:43]

Remove this.

[Mads Ager (google), 2012/10/04 10:21:51]

Thanks! Done.

 
     for (var vmOptions in vmOptionsList) {
       doTest(new TestCase('$suiteName/$testName',
-                          _append(commands,
-                              makeCommands(info, vmOptions, commonArguments)),
+                          makeCommands(info, vmOptions, commonArguments),
                           configuration,
                           completeHandler,
                           expectations,
@@ -523,18 +514,6 @@ class StandardTestSuite implements TestSuite {
     }
   }
 
-  void addExtraCommand(String command, List<String> arguments, List commands) {
-    if (command == null) return;
-    // As a special case, a command of "dart" should run with the
-    // dart VM that we are testing.
-    if (command == 'dart') {
-      command = TestUtils.vmFileName(configuration);
-    }
-    arguments =
-        arguments.map((arg)=>arg.replaceAll(r"$dartDir", dartDir.toString()));
-    commands.add(new Command(command, arguments));
-  }
-
   CreateTest makeTestCaseCreator(Map optionsFromFile) {
     return (Path filePath,
             bool hasCompileError,
@@ -713,10 +692,6 @@ class StandardTestSuite implements TestSuite {
         }
       }
 
-      var extraCommand = optionsFromFile['extraCommand'];
-      var extraArgs = optionsFromFile['extraCommandArgs'];
-      addExtraCommand(extraCommand, extraArgs, commands);
-
       // Construct the command that executes the browser test
       List<String> args;
       if (runtime == 'ie' || runtime == 'ff' || runtime == 'chrome' ||
@@ -995,10 +970,6 @@ class StandardTestSuite implements TestSuite {
         const RegExp(r"^#library\(", multiLine: true);
     RegExp sourceOrImportRegExp =
         const RegExp(r"^#(source|import|resource)\(", multiLine: true);
-    RegExp extraCommandRegExp =
-        const RegExp(r"// ExtraCommand=(.*)", multiLine: true);
-    RegExp extraArgsRegExp =
-        const RegExp(r"// ExtraCommandArgs=(.*)", multiLine: true);
 
     // Read the entire file into a byte buffer and transform it to a
     // String. This will treat the file as ascii but the only parts
@@ -1035,11 +1006,6 @@ class StandardTestSuite implements TestSuite {
       dartOptions = match[1].split(' ').filter((e) => e != '');
     }
 
-    var match = extraCommandRegExp.firstMatch(contents);
-    var extraCommand = (match != null) ? match.group(1) : null;
-    match = extraArgsRegExp.firstMatch(contents);
-    var extraCommandArgs = (match != null) ? match.group(1).split(' ') : [];
-
     matches = staticCleanRegExp.allMatches(contents);
     for (var match in matches) {
       if (isStaticClean) {
@@ -1084,9 +1050,7 @@ class StandardTestSuite implements TestSuite {
              "isLibraryDefinition": isLibraryDefinition,
              "containsSourceOrImport": containsSourceOrImport,
              "numStaticTypeAnnotations": numStaticTypeAnnotations,
-             "numCompileTimeAnnotations": numCompileTimeAnnotations,
-             "extraCommand": extraCommand,
-             "extraCommandArgs": extraCommandArgs};
+             "numCompileTimeAnnotations": numCompileTimeAnnotations };
   }
 
   List<List<String>> getVmOptions(Map optionsFromFile) {