Add runtime=dartium webdriver support to test.dart

tools/testing/dart/test_options.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_options_parser");
 
 #import("dart:io");
 #import("dart:builtin");
 #import("drt_updater.dart");
 
@@ skipping 77 matching lines @@
           new _TestOptionSpecification(
               'runtime',
               '''Where the tests should be run.
     vm: Run Dart code on the standalone dart vm.
 
     d8: Run JavaScript from the command line using v8.
 
     drt: Run Dart or JavaScript in the headless version of Chrome,
          DumpRenderTree.
 
+    dartium: Run Dart or JavaScript in Dartium.
+
     [ff | chrome | safari | ie | opera]: Run JavaScript in the specified 
          browser.
 
     none: No runtime, compile only (for example, used for dartc static analysis
           tests).''',
               ['-r', '--runtime'],
-              ['vm', 'd8', 'drt', 'ff', 'firefox', 'chrome',
+              ['vm', 'd8', 'drt', 'dartium', 'ff', 'firefox', 'chrome',
               'safari', 'ie', 'opera', 'none'],
               'vm'),
           new _TestOptionSpecification(
               'arch',
               'The architecture to run tests for',
               ['-a', '--arch'],
               ['all', 'ia32', 'x64', 'simarm'],
               'ia32'),
           new _TestOptionSpecification(
               'system',
@@ skipping 111 matching lines @@
               ['--frog'],
               [],
               ''),
           new _TestOptionSpecification(
               'drt',
               'Path to DumpRenderTree executable',
               ['--drt'],
               [],
               ''),
           new _TestOptionSpecification(
+              'dartium',
+              'Path to Dartium Chrome executable',
+              ['--dartium'],
+              [],
+              ''),
+          new _TestOptionSpecification(
               'froglib',
               'Path to frog library',
               ['--froglib'],
               [],
               ''),
           new _TestOptionSpecification(
               'noBatch',
               'Do not run browser tests in batch mode',
               ['-n', '--nobatch'],
               [],
@@ skipping 128 matching lines @@
   bool _isValidConfig(Map config) {
     bool isValid = true;
       switch (config['compiler']) {
         case 'frog':
         case 'dart2js':
         case 'frogsh':
           // Note: by adding 'none' as a configuration, if the user
           // runs test.py -c dart2js -r drt,none the dart2js_none and
           // dart2js_drt will be duplicating work. If later we don't need 'none'
           // with dart2js, we should remove it from here.
-          isValid = (const ['d8', 'drt', 'ff', 'chrome', 'safari', 'ie',
-              'opera', 'none']).indexOf(config['runtime']) >= 0;
+          isValid = (const ['d8', 'drt', 'dartium', 'ff',
+                            'chrome', 'safari',
+                            'ie', 'opera', 'none']).indexOf(config['runtime']) >= 0;

[vsm, 2012/04/10 20:00:45]

Done.

           break;
         case 'dartc':
           isValid = config['runtime'] == 'none';
           break;
         case 'none':
-          isValid = (const ['vm', 'drt']).indexOf(config['runtime']) >= 0;
+          isValid = (const ['vm', 'drt',
+                            'dartium']).indexOf(config['runtime']) >= 0;
       }
     if (!isValid) {
       print("Warning: combination of ${config['compiler']} and " +
           "${config['runtime']} is invalid. Skipping this combination.");
     }
     if (config['runtime'] == 'ie' &&
         new Platform().operatingSystem() != 'windows') {
       isValid = false;
       print("Warning cannot run Internet Explorer on non-Windows operating" +
           " system.");
@@ skipping 90 matching lines @@
     if (configuration['compiler'].contains(',')) {
       return _expandHelper('compiler', configuration);
     }
 
     // Expand runtimes.
     var runtimes = configuration['runtime'];
     if (runtimes.contains(',')) {
       return _expandHelper('runtime', configuration);
     } else {
       // All runtimes eventually go through this path, after expansion.
-      if (runtimes == 'drt') {
-        DumpRenderTreeUpdater.update();
+      var updater = runtimeUpdater(runtimes);
+      if (updater !== null) {
+        updater.update();
       }
     }
 
     // Adjust default timeout based on mode, compiler, and sometimes runtime.
     if (configuration['timeout'] == -1) {
       var timeout = 60;
       switch (configuration['compiler']) {
         case 'dartc':
           timeout *= 4;
           break;
         case 'dart2js':
         case 'frog':
           if (configuration['mode'] == 'debug') {
             timeout *= 8;
           }
           if (configuration['host_checked']) {
             timeout *= 16;
           }
           if ((const ['ie', 'ff', 'chrome', 'safari',
             'opera']).indexOf(configuration['runtime']) >= 0) {
             timeout *= 4; // Allow additional time for browser testing to run.
           }
           break;
         default:
           if (configuration['mode'] == 'debug') {
             timeout *= 2;
           }
-          if (configuration['runtime'] == 'drt') {
-            timeout *= 4;
+          if ((const ['drt', 'dartium']).indexOf(configuration['runtime'])
+              >= 0) {
+            timeout *= 4; // Allow additional time for browser testing to run.
           }
           break;
       }
       configuration['timeout'] = timeout;
     }
 
     return [configuration];
   }
 
   /**
@@ skipping 64 matching lines @@
         return option;
       }
     }
     print('Unknown test option $name');
     exit(1);
   }
 
 
   List<_TestOptionSpecification> _options;
 }