Title: [92026] trunk/Tools
- Revision
- 92026
- Author
- [email protected]
- Date
- 2011-07-29 16:00:19 -0700 (Fri, 29 Jul 2011)
Log 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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (92025 => 92026)
--- trunk/Tools/ChangeLog 2011-07-29 22:48:49 UTC (rev 92025)
+++ trunk/Tools/ChangeLog 2011-07-29 23:00:19 UTC (rev 92026)
@@ -1,3 +1,14 @@
+2011-07-29 Adam Barth <[email protected]>
+
+ 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 <[email protected]>
Fix an error in macro collapsing, refactor code to be pretty.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (92025 => 92026)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-07-29 22:48:49 UTC (rev 92025)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-07-29 23:00:19 UTC (rev 92026)
@@ -301,16 +301,24 @@
graphics_type=graphics_type))
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
if not self._filesystem.exists(overrides_path):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
