Title: [88073] trunk
- Revision
- 88073
- Author
- [email protected]
- Date
- 2011-06-03 16:02:00 -0700 (Fri, 03 Jun 2011)
Log Message
2011-06-03 Dirk Pranke <[email protected]>
Unreviewed, merge in downstream lines from Chromium as part of
landing the fix for bug 61888.
* platform/chromium/test_expectations.txt:
2011-06-03 Dirk Pranke <[email protected]>
Reviewed by Adam Barth.
nrwt: should skip chromium test expectation overrides on upstream bots
https://bugs.webkit.org/show_bug.cgi?id=61888
* Scripts/webkitpy/layout_tests/port/chromium.py:
* Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (88072 => 88073)
--- trunk/LayoutTests/ChangeLog 2011-06-03 22:52:41 UTC (rev 88072)
+++ trunk/LayoutTests/ChangeLog 2011-06-03 23:02:00 UTC (rev 88073)
@@ -1,3 +1,10 @@
+2011-06-03 Dirk Pranke <[email protected]>
+
+ Unreviewed, merge in downstream lines from Chromium as part of
+ landing the fix for bug 61888.
+
+ * platform/chromium/test_expectations.txt:
+
2011-06-03 Adam Barth <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (88072 => 88073)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-06-03 22:52:41 UTC (rev 88072)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-06-03 23:02:00 UTC (rev 88073)
@@ -3997,3 +3997,23 @@
BUGABARTH LINUX : svg/text/scaling-font-with-geometric-precision.html = IMAGE PASS
BUGCR84906 MAC : fast/dom/navigator-detached-no-crash.html = TEXT
+
+BUGCR84157 : plugins/embed-attributes-style.html = IMAGE+TEXT
+BUGCR84157 : svg/as-image/svg-as-background-with-relative-size.html = IMAGE+TEXT
+BUGCR84157 : svg/custom/embedding-external-svgs.xhtml = IMAGE+TEXT
+BUGCR84157 : svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-color-attr.html = IMAGE
+BUGCR84157 : svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-opacity-attr.html = IMAGE
+BUGCR84157 : svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-color-prop.html = IMAGE
+BUGCR84157 : svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-opacity-prop.html = IMAGE
+BUGCR84157 : fast/dom/object-plugin-hides-properties.html = TEXT
+BUGCR84157 : fast/js/property-getters-and-setters.html = TEXT
+BUGCR84157 : fast/canvas/canvas-as-image-incremental-repaint.html = IMAGE
+BUGCR84157 : fast/canvas/canvas-as-image.html = IMAGE
+BUGCR84157 : fast/canvas/canvas-bg-zoom.html = IMAGE
+BUGCR84157 : fast/canvas/canvas-bg.html = IMAGE
+BUGCR84157 : fast/canvas/canvas-currentColor.html = TEXT
+BUGCR84157 : fast/canvas/canvas-fillPath-shadow.html = TEXT
+BUGCR84157 : fast/canvas/canvas-transform-skewed.html = IMAGE
+BUGCR84157 : fast/canvas/zero-size-fill-rect.html = IMAGE
+BUGCR84157 : media/video-canvas-alpha.html = IMAGE
+
Modified: trunk/Tools/ChangeLog (88072 => 88073)
--- trunk/Tools/ChangeLog 2011-06-03 22:52:41 UTC (rev 88072)
+++ trunk/Tools/ChangeLog 2011-06-03 23:02:00 UTC (rev 88073)
@@ -1,5 +1,15 @@
2011-06-03 Dirk Pranke <[email protected]>
+ Reviewed by Adam Barth.
+
+ nrwt: should skip chromium test expectation overrides on upstream bots
+ https://bugs.webkit.org/show_bug.cgi?id=61888
+
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+
+2011-06-03 Dirk Pranke <[email protected]>
+
Reviewed by Ojan Vafai.
new-run-webkit-tests: minor logging, code cleanup
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (88072 => 88073)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-06-03 22:52:41 UTC (rev 88072)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-06-03 23:02:00 UTC (rev 88073)
@@ -262,6 +262,12 @@
return self._filesystem.read_text_file(expectations_path)
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:
+ return None
+
try:
overrides_path = self.path_from_chromium_base('webkit', 'tools',
'layout_tests', 'test_expectations.txt')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py (88072 => 88073)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py 2011-06-03 22:52:41 UTC (rev 88072)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py 2011-06-03 23:02:00 UTC (rev 88073)
@@ -228,7 +228,29 @@
exception_raised = True
self.assertFalse(exception_raised)
+ def test_overrides_and_builder_names(self):
+ port = self.make_port()
+ if not port:
+ return
+ filesystem = filesystem_mock.MockFileSystem()
+ port._filesystem = filesystem
+ port.path_from_chromium_base = lambda *comps: '/' + '/'.join(comps)
+
+ overrides_path = port.path_from_chromium_base('webkit', 'tools', 'layout_tests', 'test_expectations.txt')
+ OVERRIDES = 'foo'
+ filesystem.files[overrides_path] = OVERRIDES
+
+ port._options.builder_name = 'DUMMY_BUILDER_NAME'
+ self.assertEquals(port.test_expectations_overrides(), OVERRIDES)
+
+ port._options.builder_name = 'builder (deps)'
+ self.assertEquals(port.test_expectations_overrides(), OVERRIDES)
+
+ port._options.builder_name = 'builder'
+ self.assertEquals(port.test_expectations_overrides(), None)
+
+
class ChromiumPortLoggingTest(logtesting.LoggingTestCase):
def test_check_sys_deps(self):
mock_options = mocktool.MockOptions()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
