Changeset 92026 in webkit

Timestamp:

Jul 29, 2011, 4:00:19 PM (15 years ago)

Author:

abarth@webkit.org

Message:

Chromium try servers should use downstream test_expectations
​https://bugs.webkit.org/show_bug.cgi?id=65390

Reviewed by Dirk Pranke.

Otherwise the try servers will report bogus failures.

• Scripts/webkitpy/layout_tests/port/chromium.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-29  Adam Barth  <abarth@webkit.org>
+
+        Chromium try servers should use downstream test_expectations
+        https://bugs.webkit.org/show_bug.cgi?id=65390
+
+        Reviewed by Dirk Pranke.
+
+        Otherwise the try servers will report bogus failures.
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2011-07-29  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -302 +302 @@
         return test_configurations
 
+    try_builder_names = frozenset([
+        'linux_layout',
+        'mac_layout',
+        'win_layout',
+        'linux_layout_rel',
+        'mac_layout_rel',
+        'win_layout_rel',
+    ])
+
     def test_expectations_overrides(self):
         # FIXME: It seems bad that run_webkit_tests.py uses a hardcoded dummy
         # builder string instead of just using None.
         builder_name = self.get_option('builder_name', 'DUMMY_BUILDER_NAME')
-        if builder_name != 'DUMMY_BUILDER_NAME' and not '(deps)' in builder_name:
+        if builder_name != 'DUMMY_BUILDER_NAME' and not '(deps)' in builder_name and not builder_name in self.try_builder_names:
             return None
 
         try:
-            overrides_path = self.path_from_chromium_base('webkit', 'tools',
-                'layout_tests', 'test_expectations.txt')
+            overrides_path = self.path_from_chromium_base('webkit', 'tools', 'layout_tests', 'test_expectations.txt')
         except AssertionError:
             return None