Selenium / Dartium cleanup

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 598 matching lines @@
       }
 
       // 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/tools/testing/run_selenium.py',
             '--browser=$runtime',
             '--timeout=${configuration["timeout"] - 2}',
             '--out=$htmlPath'];
+        if (runtime == 'dartium') {
+          args.add('--executable=$dartiumFilename');
+        }
       } else {
         args = [
             '$dartDir/tools/testing/drt-trampoline.py',
             dumpRenderTreeFilename,
             '--no-timeout'
         ];
         if (runtime == 'drt' && compiler == 'none') {
           var dartFlags = ['--ignore-unrecognized-flags'];
           if (configuration["checked"]) {
             dartFlags.add('--enable_asserts');
@@ skipping 139 matching lines @@
     return filename.replaceAll('/', '_').replaceAll(':', '_')
         .replaceAll('\\', '_') + configuration['compiler'] + '-' +
         configuration['runtime'] + '.html';
   }
 
   String get dumpRenderTreeFilename() {
     if (configuration['drt'] != '') {
       return configuration['drt'];
     }
     if (new Platform().operatingSystem() == 'macos') {
-      return '$dartDir/client/tests/drt/DumpRenderTree.app/Contents/' +
+      return '$dartDir/client/tests/drt/DumpRenderTree.app/Contents/'
           'MacOS/DumpRenderTree';
     }
     return '$dartDir/client/tests/drt/DumpRenderTree';
   }
 
+  String get dartiumFilename() {
+    if (configuration['dartium'] != '') {
+      return configuration['dartium'];
+    }
+    if (new Platform().operatingSystem() == 'macos') {
+      return '$dartDir/client/tests/dartium/Chromium.app/Contents/'
+          'MacOS/Chromium';
+    }
+    return '$dartDir/client/tests/dartium/chrome';
+  }
+
   void testGeneratorStarted() {
     ++activeTestGenerators;
   }
 
   void testGeneratorDone() {
     --activeTestGenerators;
     if (activeTestGenerators == 0 && listingDone) {
       doDone();
     }
   }
@@ skipping 572 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);
    }
 }