bots: include webdriver tests in bots.

Review URL: http://codereview.chromium.org//9188012

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@3206 260f80e4-7a28-3924-810f-c04153c831b5

client/tests/client/client.status

@@ -14,7 +14,7 @@ layout/layout_tests: Skip  # Issue 152.
 touch/touch_tests: Skip  # Issue 157.
 html/html_tests: Skip  # Doesn't recognize SVGElement constructors
 
-[ $component == frogium ]
+[ $component == frogium || ($component == webdriver && $browser == chrome) ]
 touch/touch_tests: Fail  # Issue 157.
 layout/layout_tests: Skip # Issue 152, also seems flaky
 samples/dartcombat/dartcombat_tests: Skip # passes locally but timeout on bot?
@@ -25,6 +25,15 @@ samples/total/total_tests: Skip # Issue 867.
 [ $component == frogium && $checked ]
 html/html_tests: Fail  # HTMLDivElement not assignable to EventTarget
 
+[ $component == webdriver && $browser == ff ]
+*: Skip
+
+[ $component == webdriver && $browser == ie && ($system == linux || $system == mac) ]
+*: Skip
+
+[ $component == webdriver && $browser == safari && ($system == linux || $system == windows) ]
+*: Skip
+
 [ $component == chromium && $mode == release ]
 
 

tests/corelib/corelib.status

@@ -23,7 +23,7 @@ IndexedListAccessTest: Fail     # Issue 274
 *VMTest: Skip
 
 
-[ $component == frog || $component == frogsh || $component == frogium ]
+[ $component == frog || $component == frogsh || $component == frogium || ($component == webdriver && $browser == chrome) ]
 # VM or DartC specific tests not to be run by Frog. See language.status.
 *VMTest: Skip
 *VMNegativeTest: Skip
@@ -51,6 +51,14 @@ StringPatternTest: Fail
 StringSubstringTest: Fail
 StringTest: Fail  # Needs index out of range checks.
 
+[ $component == webdriver && $browser == ff ]
+*: Skip
+
+[ $component == webdriver && $browser == ie && ($system == linux || $system == mac) ]
+*: Skip
+
+[ $component == webdriver && $browser == safari && ($system == linux || $system == windows) ]
+*: Skip
 
 [ $arch == x64 ]
 *: Skip

tests/isolate/isolate.status

@@ -24,7 +24,7 @@ StaticStateTest: Fail         # Bug 5401734
 [ $arch == chromium ]
 MandelIsolateTest: Skip     # Bug 5353937.
 
-[ $component == frogium ]
+[ $component == frogium || ($component == webdriver && $browser == chrome) ]
 CrossIsolateMessageTest:Fail # HTMLElement should be hidden in workers
 MixedTest: Fail              # HTMLElement should be hidden in workers
 Mixed2Test: Fail             # HTMLElement should be hidden in workers
@@ -32,6 +32,15 @@ Message2Test: Fail           # postMessage API currently expects String messages
 NestedSpawn2Test: Fail
 NestedSpawnTest: Fail
 
+[ $component == webdriver && $browser == ff ]
+*: Skip
+
+[ $component == webdriver && $browser == ie && ($system == linux || $system == mac) ]
+*: Skip
+
+[ $component == webdriver && $browser == safari && ($system == linux || $system == windows) ]
+*: Skip
+
 [ $component == leg ]
 # TODO(ahe): Enable when leg matures.
 *: Skip

tests/language/language.status

@@ -176,9 +176,7 @@ TypedMessageTest: Fail # Bug 5246195
 [ $component == frog ]
 ToStringAsFixedTest: Fail # fails due to rounding in constant propagation
 
-[ $component == frogsh ||  $component == frog || $component == webdriver || $component == frogium ]
-# TODO(efortuna): Distinguish between specific browser being run for webdriver
-# (by flag option) to specify which tests pass.
+[ $component == frogsh ||  $component == frog || ($component == webdriver && $browser == chrome) || $component == frogium ]
 Factory3Test: Fail # Issue 417
 CallThroughNullGetterTest: Fail # Throw ObjectNotClosure instead of NullPointerException.
 OptimizedSetterTest: Fail # Issue 863
@@ -300,6 +298,14 @@ ImplicitThisTest/03: Fail # Issue 376
 ImplicitThisTest/04: Fail # Issue 376
 ImplicitThisTest/none: Fail # Issue 376
 
+[ $component == webdriver && $browser == ff ]
+*: Skip
+
+[ $component == webdriver && $browser == ie && ($system == linux || $system == mac) ]
+*: Skip
+
+[ $component == webdriver && $browser == safari && ($system == linux || $system == windows) ]
+*: Skip
 
 [ ($component == frogsh ||  $component == frog || $component == frogium) && $unchecked ]
 PrivateMemberTest/01: Fail # test seems bad - see issue #353

tools/testing/dart/test_options.dart

@@ -151,6 +151,12 @@ is 'dart file.dart' and you specify special command
               [],
               false,
               'bool'),
+          new _TestOptionSpecification(
+              'browser',
+              'Web browser to use on webdriver tests',
+              ['-b', '--browser'],
+              ['ff', 'chrome', 'safari', 'ie'],
+              'chrome'),
           new _TestOptionSpecification(
               'flag',
               'Component-specific extra flags, comma separated',

tools/testing/dart/test_suite.dart

@@ -460,27 +460,7 @@ class StandardTestSuite implements TestSuite {
       List<String> args;
       if (component == 'webdriver') {
         executable = '$dartDir/tools/testing/run_selenium.py';
-        String browserFlag = 'chrome';
-        if (configuration['flag'] != null) {
-          for (var flag in configuration['flag'].split(',')) {
-            switch (flag) {
-              case 'ff':
-              case 'firefox':
-                browserFlag = 'ff';
-                break;
-              case 'ie':
-              case 'explorer':
-              case 'internet-explorer':
-                browserFlag = 'ie';
-                break;
-              case 'safari':
-                browserFlag = 'safari';
-                break;
-            }
-          }
-        }
-        args = ['--out', htmlPath, '--browser', browserFlag];
-
+        args = ['--out', htmlPath, '--browser', configuration['browser']];
       } else {
         args = ['--no-timeout'];
         if (component == 'dartium') {

utils/tests/css/css.status

@@ -4,7 +4,7 @@
 
 prefix css
 
-[$component == leg || $component == frogium]
+[$component == leg || $component == frogium || $component == webdriver ]
 # #-directives not supported by test architecture
 DeclarationTest: Fail
 ExpressionTest: Fail

utils/tests/peg/peg.status

@@ -7,5 +7,5 @@ prefix peg
 [ $component == dartc ]
 PegTest: Skip  # Undiagnosed error on "a ? b ? c : d : e ? f : g"
 
-[ $component == frogium ]
+[ $component == frogium || $component == webdriver ]
 PegTest: Skip  # #-directives not supported by browser test architecture