Add browser path options to testing scripts.

tools/testing/dart/utils.dart

 // Copyright (c) 2013, 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 utils;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:math' show min;
 import 'dart:convert';
@@ skipping 108 matching lines @@
 }
 
 // TODO(kustermann,ricow): As soon we have a debug log we should log
 // invalid utf8-encoded input to the log.
 // Currently invalid bytes will be replaced by a replacement character.
 String decodeUtf8(List<int> bytes) {
   return UTF8.decode(bytes, allowMalformed: true);
 }
 
 class Locations {
-  static String getDartiumLocation(Map globalConfiguration) {
-    var dartium = globalConfiguration['dartium'];
-    if (dartium != null && dartium != '') {
-      return dartium;
+  static String getBrowserLocation(String browserName,
+                                   Map globalConfiguration) {
+    var location = globalConfiguration[browserName];
+    if (location != null && location != '') {
+      return location;
     }
-    if (Platform.operatingSystem == 'macos') {
-      return new Path('client/tests/dartium/Chromium.app/Contents/'
-          'MacOS/Chromium').toNativePath();
+    switch (browserName) {

[kustermann, 2013/11/06 14:28:01]

You could do something like this, to make it a bit more readable:
var browserLocations = {
  'firefox' : {
    'windows' : '...',
    'linux' : '...',
    'macos' : '...',
  }
  'ie9' : {
    'windows' : '...',
  }
  ...
}

if (browserLocations.containsKey(browserName)) {
  throw "unsupported browser";
}

if (!browserLocations[browserName].containsKey(Platform.operatingSystem)) {
  throw "$browserName not supported on ${Platform.operatingSystem}";
}
return browserLocations[browserName][Platform.operatingSystem];

+      case 'firefox':
+        if (Platform.isWindows) {
+          return "C:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe";
+        } else if (Platform.isLinux) {
+          return 'firefox';
+        } else if (Platform.isMacOS) {
+          return "/Applications/Firefox.app/Contents/MacOS/firefox";
+        } else {
+          throw 'Firefox not supported on ${Platform.operatingSystem}';
+        }
+        break;
+      case 'chrome':
+        if (Platform.isWindows) {
+          return "C:\\Program Files (x86)\\Google\\Chrome"
+                 "\\Application\\chrome.exe";
+        } else if (Platform.isMacOS) {
+          return "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome";
+        } else if (Platform.isLinux) {
+          return 'google-chrome';
+        } else {
+          throw "Chrome is not supported on ${Platform.operatingSystem}";
+        }
+        break;
+      case 'dartium':
+        if (Platform.isMacOS) {
+          return 'client/tests/dartium/Chromium.app/Contents/MacOS/Chromium';
+        } else {
+          return new Uri.file('client/tests/dartium/chrome').toFilePath();
+        }
+        break;
+      case 'safari':
+        if (Platform.isMacOS) {
+          return "/Applications/Safari.app/Contents/MacOS/Safari";
+        } else {
+          throw "Safari browser not supported on ${Platform.operatingSystem}";
+        }
+        break;
+      case 'ie9':
+      case 'ie10':
+        return "C:\\Program Files\\Internet Explorer\\iexplore.exe";
+        break;
+      default:
+        throw 'Non-supported browser $browserName';
     }
-    return new Path('client/tests/dartium/chrome').toNativePath();
   }
 }
 
 // This function is pretty stupid and only puts quotes around an argument if
 // it the argument contains a space.
 String escapeCommandLineArgument(String argument) {
   if (argument.contains(' ')) {
     return '"$argument"';
   }
   return argument;
@@ skipping 11 matching lines @@
 
 class UniqueObject {
   static int _nextId = 1;
   final int _hashCode;
 
   int get hashCode => _hashCode;
   operator==(other) => other is UniqueObject && _hashCode == other._hashCode;
 
   UniqueObject() : _hashCode = ++_nextId;
 }