gistfile1

commit 67ce3e54c7cce448e75c51ef786fe9483a286891
Author: Zeno Albisser <[email protected]>
Date:   Tue Dec 18 16:59:50 2012 +0100

    update TestExpecations for WebGL on mac

diff --git a/LayoutTests/platform/qt-5.0-wk2-mac/TestExpectations b/LayoutTests/platform/qt-5.0-wk2-mac/TestExpectations
new file mode 100644
index 0000000..8e28762
--- /dev/null
+++ b/LayoutTests/platform/qt-5.0-wk2-mac/TestExpectations
@@ -0,0 +1,82 @@
+# These are the layout test expectations for the Qt port of WebKit.
+#
+# See http://trac.webkit.org/wiki/TestExpectations for more information on this file.
+
+#
+# For the qt-mac build we only want to test a minor subset of all the tests.
+#
+
+accessibility [ Skip ]
+animations [ Skip ]
+batterystatus [ Skip ]
+canvas [ Skip ]
+compositing [ Skip ]
+css1 [ Skip ]
+css2.1 [ Skip ]
+css3 [ Skip ]
+cssom [ Skip ]
+dom [ Skip ]
+editing [ Skip ]
+fast [ Skip ]
+fonts [ Skip ]
+fullscreen [ Skip ]
+gamepad [ Skip ]
+html5lib [ Skip ]
+http [ Skip ]
+ietestcenter [ Skip ]
+inspector [ Skip ]
+inspector-protocol [ Skip ]
+java [ Skip ]
+jquery [ Skip ]
+loader [ Skip ]
+media [ Skip ]
+mhtml [ Skip ]
+networkinformation [ Skip ]
+perf [ Skip ]
+platform [ Skip ]
+plugins [ Skip ]
+pointer-lock [ Skip ]
+printing [ Skip ]
+proximity [ Skip ]
+resources [ Skip ]
+scrollbars [ Skip ]
+security [ Skip ]
+sputnik [ Skip ]
+storage [ Skip ]
+svg [ Skip ]
+tables [ Skip ]
+touchadjustment [ Skip ]
+transforms [ Skip ]
+transitions [ Skip ]
+traversal [ Skip ]
+userscripts [ Skip ]
+webarchive [ Skip ]
+webaudio [ Skip ]
+webintents [ Skip ]
+xmlviewer [ Skip ]
+
+#
+# We are whitelisting a few specific tests we are interested in.
+#
+
+Bug(zalbisser) fast/canvas/webgl [ Pass ]
+
+#
+# The following tests are currently failing and need investigation before unskipping.
+#
+
+Bug(zalbisser) fast/canvas/webgl/arraybuffer-transfer-of-control.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/framebuffer-object-attachment.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/oes-element-index-uint.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/oes-vertex-array-object.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/premultiplyalpha-test.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html [ Skip ]
+
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/qt.py b/Tools/Scripts/webkitpy/layout_tests/port/qt.py
index c9a3bb4..020dc3a 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/qt.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/qt.py
@@ -115,6 +115,8 @@ class QtPort(Port):
         return version
 
     def _search_paths(self):
+        #                 qt-5.0-wk2-mac
+        #                /
         # qt-5.0-wk1    qt-5.0-wk2
         #            \/
         #         qt-5.0    qt-4.8
@@ -126,6 +128,8 @@ class QtPort(Port):
         version = self.qt_version()
         if '5.0' in version:
             if self.get_option('webkit_test_runner'):
+                if self.operating_system() == 'mac':
+                    search_paths.append('qt-5.0-wk2-mac')
                 search_paths.append('qt-5.0-wk2')
             else:
                 search_paths.append('qt-5.0-wk1')