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

tools/testing/dart/test_suite.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.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 427 matching lines @@
         isNegative = true;
       }
     }
 
     var commonArguments = commonArgumentsFromFile(info.filePath,
                                                   info.optionsFromFile);
 
     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,
                           isNegative: isNegative,
                           info: info));
     }
   }
 
   List<Command> makeCommands(TestInformation info, var vmOptions, var args) {
     switch (configuration['compiler']) {
@@ skipping 44 matching lines @@
     case 'dartc':
       var arguments = new List.from(vmOptions);
       arguments.addAll(args);
       return <Command>[new Command(shellPath(), arguments)];
 
     default:
       throw 'Unknown compiler ${configuration["compiler"]}';
     }
   }
 
-  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,
             bool hasRuntimeError,
             {bool isNegativeIfChecked: false,
              bool hasFatalTypeErrors: false,
              Set<String> multitestOutcome: null}) {
       // Cache the test information for each test case.
       var info = new TestInformation(filePath,
                                      optionsFromFile,
@@ skipping 158 matching lines @@
           Path namePath = new Path(name);
           Expect.equals(namePath.extension, 'dart');
           String baseName = namePath.filenameWithoutExtension;
           Path fromPath = filePath.directoryPath.join(namePath);
           commands.add(_compileCommand(
               fromPath.toNativePath(), '$tempDir/$baseName.js',
               compiler, tempDir, vmOptions));
         }
       }
 
-      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' ||
           runtime == 'safari' || runtime == 'opera' || runtime == 'dartium') {
         args = [dartDir.append('tools/testing/run_selenium.py').toNativePath(),
             '--browser=$runtime',
             '--timeout=${configuration["timeout"] - 2}',
             '--out=$htmlPath'];
         if (runtime == 'dartium') {
           args.add('--executable=$dartiumFilename');
@@ skipping 258 matching lines @@
     RegExp staticCleanRegExp = const RegExp(r"// @static-clean");
     RegExp leadingHashRegExp = const RegExp(r"^#", multiLine: true);
     RegExp isolateStubsRegExp = const RegExp(r"// IsolateStubs=(.*)");
     RegExp domImportRegExp =
         const RegExp(r"^#import.*(dart:(dom|html)|html\.dart).*\)",
                      multiLine: true);
     RegExp libraryDefinitionRegExp =
         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
     // we are interested in will be ascii in any case.
     RandomAccessFile file = new File.fromPath(filePath).openSync(FileMode.READ);
     List chars = new List(file.lengthSync());
     var offset = 0;
     while (offset != chars.length) {
       offset += file.readListSync(chars, offset, chars.length - offset);
     }
@@ skipping 16 matching lines @@
 
     matches = dartOptionsRegExp.allMatches(contents);
     for (var match in matches) {
       if (dartOptions != null) {
         throw new Exception(
             'More than one "// DartOptions=" line in test $filePath');
       }
       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) {
         throw new Exception(
             'More than one "// @static-clean=" line in test $filePath');
       }
       isStaticClean = true;
     }
 
     List<String> otherScripts = new List<String>();
@@ skipping 24 matching lines @@
              "hasRuntimeError": hasRuntimeError,
              "isStaticClean" : isStaticClean,
              "otherScripts": otherScripts,
              "isMultitest": isMultitest,
              "containsLeadingHash": containsLeadingHash,
              "isolateStubs": isolateStubs,
              "containsDomImport": containsDomImport,
              "isLibraryDefinition": isLibraryDefinition,
              "containsSourceOrImport": containsSourceOrImport,
              "numStaticTypeAnnotations": numStaticTypeAnnotations,
-             "numCompileTimeAnnotations": numCompileTimeAnnotations,
-             "extraCommand": extraCommand,
-             "extraCommandArgs": extraCommandArgs};
+             "numCompileTimeAnnotations": numCompileTimeAnnotations };
   }
 
   List<List<String>> getVmOptions(Map optionsFromFile) {
     bool needsVmOptions = Contains(configuration['compiler'],
                                    const ['none', 'dart2dart', 'dartc']) &&
                           Contains(configuration['runtime'],
                                    const ['none', 'vm', 'drt', 'dartium']);
     if (!needsVmOptions) return [[]];
     return optionsFromFile['vmOptions'];
   }
@@ skipping 391 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);
    }
 }