Changeset 88073 in webkit

Timestamp:

Jun 3, 2011 4:02:00 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-06-03 Dirk Pranke <​dpranke@chromium.org>

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 <​dpranke@chromium.org>

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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/layout_tests/port/chromium.py (modified) (1 diff)
• Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-03  Dirk Pranke  <dpranke@chromium.org>
+
+        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  <abarth@webkit.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3998 +3998 @@
 
 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
+

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-03  Dirk Pranke  <dpranke@chromium.org>
+
+        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  <dpranke@chromium.org>
 

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

@@ -263 +263 @@
 
     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',

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

@@ -229 +229 @@
         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):