Make update-flaky-tests to work again and support all bots

Tools/Scripts/webkitpy/layout_tests/port/builders.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 19 matching lines @@
 
 from webkitpy.common.memoized import memoized
 
 
 # In this dictionary, each item stores:
 # * port_name -- a fully qualified port name
 # * rebaseline_override_dir -- (optional) directory to put baselines in instead of where you would normally put them.
 #      This is useful when we don't have bots that cover particular configurations; so, e.g., you might
 #      support mac-mountainlion but not have a mac-mountainlion bot yet, so you'd want to put the mac-lion
 #      results into platform/mac temporarily.
+# * specifiers -- TestExpectation specifiers for that config. Valid values are found in
+#      TestExpectationsParser._configuration_tokens_list
 
 _exact_matches = {
-    "WebKit XP": {"port_name": "win-xp"},
-    "WebKit Win7": {"port_name": "win-win7"},
-    "WebKit Win7 (dbg)": {"port_name": "win-win7"},
-    "WebKit Linux": {"port_name": "linux-x86_64"},
-    "WebKit Linux 32": {"port_name": "linux-x86"},
-    "WebKit Linux (dbg)": {"port_name": "linux-x86_64"},
-    "WebKit Linux ASAN": {"port_name": "linux-x86_64"},
-    "WebKit Mac10.6": {"port_name": "mac-snowleopard"},
-    "WebKit Mac10.6 (dbg)": {"port_name": "mac-snowleopard"},
-    "WebKit Mac10.7": {"port_name": "mac-lion"},
-    "WebKit Mac10.7 (dbg)": {"port_name": "mac-lion"},
-    "WebKit Mac10.8": {"port_name": "mac-mountainlion"},
-    "WebKit Mac10.8 (retina)": {"port_name": "mac-retina"},
-    "WebKit Mac10.9": {"port_name": "mac-mavericks"},
-    "WebKit Android (Nexus4)": {"port_name": "android"},
+    "WebKit XP": {"port_name": "win-xp", "specifiers": ['XP']},

[ojan, 2014/05/29 18:51:20]

It's a bummer to hard-code this. Can you add a FIXME to figure out this list
from the builder name?

[Dirk Pranke, 2014/05/29 18:59:56]

I'm not sure that that would be any cleaner. I thought about this change for a
while and actually feel pretty good about it as-is.

[ojan, 2014/05/29 19:37:04]

It's another place where we've duplicated specifier strings. We already have
these strings elsewhere in the code (e.g. TestExpectations needs to understand
these strings). If we change specifiers, we shouldn't need to change multiple
places in the code, e.g. 'Win7' should only exist in one place in the codebase.

But yes, I think this is fine for now. I was just asking for a FIXME.

+    "WebKit Win7": {"port_name": "win-win7", "specifiers": ['Win7']},

[Dirk Pranke, 2014/05/29 18:25:21]

Should the non-dbg bots have 'Release'?

+    "WebKit Win7 (dbg)": {"port_name": "win-win7", "specifiers": ['Win7', 'Debug']},
+    "WebKit Linux": {"port_name": "linux-x86_64", "specifiers": ['Linux']},
+    "WebKit Linux 32": {"port_name": "linux-x86", "specifiers": ['Linux']},
+    "WebKit Linux (dbg)": {"port_name": "linux-x86_64", "specifiers": ['Linux', 'Debug']},
+    "WebKit Linux ASAN": {"port_name": "linux-x86_64", "specifiers": ['Linux']},
+    "WebKit Mac10.6": {"port_name": "mac-snowleopard", "specifiers": ['SnowLeopard']},
+    "WebKit Mac10.6 (dbg)": {"port_name": "mac-snowleopard", "specifiers": ['SnowLeopard', 'Debug']},
+    "WebKit Mac10.7": {"port_name": "mac-lion", "specifiers": ['Lion']},
+    "WebKit Mac10.7 (dbg)": {"port_name": "mac-lion", "specifiers": ['Lion', 'Debug']},
+    "WebKit Mac10.8": {"port_name": "mac-mountainlion", "specifiers": ['MountainLion']},
+    "WebKit Mac10.8 (retina)": {"port_name": "mac-retina", "specifiers": ['MountainLion', 'Retina']},

[Dirk Pranke, 2014/05/29 18:25:21]

This one should just be retina.

+    "WebKit Mac10.9": {"port_name": "mac-mavericks", "specifiers": ['Mavericks', 'Retina']},

[Dirk Pranke, 2014/05/29 18:25:21]

This one isn't retina.

+    "WebKit Android (Nexus4)": {"port_name": "android", "specifiers": ['Android']},
 }
 
 
 # Mapping from port name to the deps builder of the same os:
 _deps_builders = {
     "linux-x86": "WebKit Linux (deps)",
     "linux-x86_64": "WebKit Linux (deps)",
     "win-xp": "WebKit XP (deps)",
     "win-win7": "WebKit XP (deps)",
     "mac-snowleopard": "WebKit Mac10.6 (deps)",
@@ skipping 21 matching lines @@
 
 
 def rebaseline_override_dir(builder_name):
     return _exact_matches[builder_name].get("rebaseline_override_dir", None)
 
 
 def port_name_for_builder_name(builder_name):
     return _exact_matches[builder_name]["port_name"]
 
 
+def specifiers_for_builder(builder_name):
+    return _exact_matches[builder_name]["specifiers"]
+
+
 def builder_name_for_port_name(target_port_name):
     debug_builder_name = None
     for builder_name, builder_info in _exact_matches.items():
         if builder_info['port_name'] == target_port_name:
             if 'dbg' in builder_name:
                 debug_builder_name = builder_name
             else:
                 return builder_name
     return debug_builder_name
 
 
 def builder_path_for_port_name(port_name):
     builder_path_from_name(builder_name_for_port_name(port_name))
 
 
 def deps_builder_name_for_port_name(target_port_name):
     return _deps_builders.get(target_port_name, None)