test.dart: Serve the browser test driver page from the test file HTTP server.

tools/testing/dart/test_runner.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 executing tests.
  *
  * This module includes:
  * - Managing parallel execution of tests, including timeout checks.
  * - Evaluating the output of each test as pass/fail/crash/timeout.
@@ skipping 275 matching lines @@
   bool _equal(Command other) {
     return other is ContentShellCommand && super._equal(other);
   }
 
   int get maxNumRetries => 3;
 }
 
 class BrowserTestCommand extends Command {
   final String browser;
   final String url;
-  final bool checkedMode; // needed for dartium
+  final Map configuration;
 
   BrowserTestCommand._(String _browser,
                        this.url,
-                       {bool this.checkedMode: false})
+                       this.configuration)
       : super._(_browser), browser = _browser;
 
   void _buildHashCode(HashCodeBuilder builder) {
     super._buildHashCode(builder);
     builder.add(browser);
     builder.add(url);
-    builder.add(checkedMode);
+    builder.add(configuration);
   }
 
   bool _equal(Command other) {
     return
         other is BrowserTestCommand &&
         super._equal(other) &&
         browser == other.browser &&
         url == other.url &&
-        checkedMode == other.checkedMode;
+        identical(configuration, other.configuration);
   }
 
   String get reproductionCommand {
     var parts = [TestUtils.dartTestExecutable.toString(),
                 'tools/testing/dart/launch_browser.dart',
                 browser,
                 url];
     return parts.map(escapeCommandLineArgument).join(' ');
   }
 }
@@ skipping 264 matching lines @@
                                              List<String> options,
                                              List<String> dartFlags,
                                              Map<String, String> environment) {
     ContentShellCommand command = new ContentShellCommand._(
         executable, htmlFile, options, dartFlags, environment);
     return _getUniqueCommand(command);
   }
 
   BrowserTestCommand getBrowserTestCommand(String browser,
                                            String url,
-                                           {bool checkedMode: false}) {
-    var command = new BrowserTestCommand._(
-        browser, url, checkedMode: checkedMode);
+                                           Map configuration) {
+    var command = new BrowserTestCommand._(browser, url, configuration);
     return _getUniqueCommand(command);
   }
 
   CompilationCommand getCompilationCommand(String displayName,
                                            outputFile,
                                            neverSkipCompilation,
                                            List<Uri> bootstrapDependencies,
                                            String executable,
                                            List<String> arguments,
                                            Map<String, String> environment) {
@@ skipping 1841 matching lines @@
       dgraph.Node node, Command command, int timeout);
 }
 
 class CommandExecutorImpl implements CommandExecutor {
   final Map globalConfiguration;
   final int maxProcesses;
   final int maxBrowserProcesses;
 
   // For dartanalyzer batch processing we keep a list of batch processes.
   final _batchProcesses = new Map<String, List<BatchRunnerProcess>>();
-  // We keep a BrowserTestRunner for every "browserName-checked" configuration.
-  final _browserTestRunners = new Map<String, BrowserTestRunner>();
+  // We keep a BrowserTestRunner for every configuration.
+  final _browserTestRunners = new Map<Map, BrowserTestRunner>();
 
   bool _finishing = false;
 
   CommandExecutorImpl(
       this.globalConfiguration, this.maxProcesses, this.maxBrowserProcesses);
 
   Future cleanup() {
     assert(!_finishing);
     _finishing = true;
 
@@ skipping 71 matching lines @@
       BrowserTestCommand browserCommand, int timeout) {
     var completer = new Completer<CommandOutput>();
 
     var callback = (BrowserTestOutput output) {
       completer.complete(
           new BrowserControllerTestOutcome(browserCommand, output));
     };
     BrowserTest browserTest = new BrowserTest(browserCommand.url,
                                               callback,
                                               timeout);
-    _getBrowserTestRunner(browserCommand.browser, browserCommand.checkedMode)
+    _getBrowserTestRunner(browserCommand.browser, browserCommand.configuration)
         .then((testRunner) {
       testRunner.queueTest(browserTest);
     });
 
     return completer.future;
   }
 
-  Future<BrowserTestRunner> _getBrowserTestRunner(
-      String browser, bool checkedMode) {
-    var browserCheckedString = "$browser-$checkedMode";
-
+  Future<BrowserTestRunner> _getBrowserTestRunner(String browser,
+                                                  Map configuration) {
     var localIp = globalConfiguration['local_ip'];
     var num_browsers = maxBrowserProcesses;
-    if (_browserTestRunners[browserCheckedString] == null) {
+    if (_browserTestRunners[configuration] == null) {
       var testRunner = new BrowserTestRunner(
-            globalConfiguration, localIp, browser, num_browsers,
-            checkedMode: checkedMode);
+            configuration, localIp, browser, num_browsers);
       if (globalConfiguration['verbose']) {
         testRunner.logger = DebugLogger.info;
       }
-      _browserTestRunners[browserCheckedString] = testRunner;
+      _browserTestRunners[configuration] = testRunner;
       return testRunner.start().then((started) {
         if (started) {
           return testRunner;
         }
         print("Issue starting browser test runner");
         io.exit(1);
       });
     }
-    return new Future.value(_browserTestRunners[browserCheckedString]);
+    return new Future.value(_browserTestRunners[configuration]);
   }
 }
 
 class RecordingCommandExecutor implements CommandExecutor {
   TestCaseRecorder _recorder;
 
   RecordingCommandExecutor(Path path)
       : _recorder = new TestCaseRecorder(path);
 
   Future<CommandOutput> runCommand(node, ProcessCommand command, int timeout) {
@@ skipping 358 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
     _allDone();
   }
 }