Changeset 88073 in webkit
- Timestamp:
- Jun 3, 2011 4:02:00 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r88071 r88073 1 2011-06-03 Dirk Pranke <dpranke@chromium.org> 2 3 Unreviewed, merge in downstream lines from Chromium as part of 4 landing the fix for bug 61888. 5 6 * platform/chromium/test_expectations.txt: 7 1 8 2011-06-03 Adam Barth <abarth@webkit.org> 2 9 -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r88068 r88073 3998 3998 3999 3999 BUGCR84906 MAC : fast/dom/navigator-detached-no-crash.html = TEXT 4000 4001 BUGCR84157 : plugins/embed-attributes-style.html = IMAGE+TEXT 4002 BUGCR84157 : svg/as-image/svg-as-background-with-relative-size.html = IMAGE+TEXT 4003 BUGCR84157 : svg/custom/embedding-external-svgs.xhtml = IMAGE+TEXT 4004 BUGCR84157 : svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-color-attr.html = IMAGE 4005 BUGCR84157 : svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-opacity-attr.html = IMAGE 4006 BUGCR84157 : svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-color-prop.html = IMAGE 4007 BUGCR84157 : svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-opacity-prop.html = IMAGE 4008 BUGCR84157 : fast/dom/object-plugin-hides-properties.html = TEXT 4009 BUGCR84157 : fast/js/property-getters-and-setters.html = TEXT 4010 BUGCR84157 : fast/canvas/canvas-as-image-incremental-repaint.html = IMAGE 4011 BUGCR84157 : fast/canvas/canvas-as-image.html = IMAGE 4012 BUGCR84157 : fast/canvas/canvas-bg-zoom.html = IMAGE 4013 BUGCR84157 : fast/canvas/canvas-bg.html = IMAGE 4014 BUGCR84157 : fast/canvas/canvas-currentColor.html = TEXT 4015 BUGCR84157 : fast/canvas/canvas-fillPath-shadow.html = TEXT 4016 BUGCR84157 : fast/canvas/canvas-transform-skewed.html = IMAGE 4017 BUGCR84157 : fast/canvas/zero-size-fill-rect.html = IMAGE 4018 BUGCR84157 : media/video-canvas-alpha.html = IMAGE 4019 -
trunk/Tools/ChangeLog
r88070 r88073 1 2011-06-03 Dirk Pranke <dpranke@chromium.org> 2 3 Reviewed by Adam Barth. 4 5 nrwt: should skip chromium test expectation overrides on upstream bots 6 https://bugs.webkit.org/show_bug.cgi?id=61888 7 8 * Scripts/webkitpy/layout_tests/port/chromium.py: 9 * Scripts/webkitpy/layout_tests/port/chromium_unittest.py: 10 1 11 2011-06-03 Dirk Pranke <dpranke@chromium.org> 2 12 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
r85797 r88073 263 263 264 264 def test_expectations_overrides(self): 265 # FIXME: It seems bad that run_webkit_tests.py uses a hardcoded dummy 266 # builder string instead of just using None. 267 builder_name = self.get_option('builder_name', 'DUMMY_BUILDER_NAME') 268 if builder_name != 'DUMMY_BUILDER_NAME' and not '(deps)' in builder_name: 269 return None 270 265 271 try: 266 272 overrides_path = self.path_from_chromium_base('webkit', 'tools', -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
r85347 r88073 229 229 self.assertFalse(exception_raised) 230 230 231 def test_overrides_and_builder_names(self): 232 port = self.make_port() 233 if not port: 234 return 235 236 filesystem = filesystem_mock.MockFileSystem() 237 port._filesystem = filesystem 238 port.path_from_chromium_base = lambda *comps: '/' + '/'.join(comps) 239 240 overrides_path = port.path_from_chromium_base('webkit', 'tools', 'layout_tests', 'test_expectations.txt') 241 OVERRIDES = 'foo' 242 filesystem.files[overrides_path] = OVERRIDES 243 244 port._options.builder_name = 'DUMMY_BUILDER_NAME' 245 self.assertEquals(port.test_expectations_overrides(), OVERRIDES) 246 247 port._options.builder_name = 'builder (deps)' 248 self.assertEquals(port.test_expectations_overrides(), OVERRIDES) 249 250 port._options.builder_name = 'builder' 251 self.assertEquals(port.test_expectations_overrides(), None) 252 231 253 232 254 class ChromiumPortLoggingTest(logtesting.LoggingTestCase):
Note: See TracChangeset
for help on using the changeset viewer.