Modified: trunk/LayoutTests/ChangeLog (138352 => 138353)
--- trunk/LayoutTests/ChangeLog 2012-12-21 07:40:23 UTC (rev 138352)
+++ trunk/LayoutTests/ChangeLog 2012-12-21 09:07:13 UTC (rev 138353)
@@ -1,3 +1,17 @@
+2012-12-21 Zeno Albisser <z...@webkit.org>
+
+ [Qt] Add new TestExpectations for qt-5.0-mac-wk2.
+ https://bugs.webkit.org/show_bug.cgi?id=105424
+
+ This change will allow us to run a very specific
+ subset of the available LayoutTests on a mac buildbot.
+ The new baseline search path for mac will look as follows:
+ qt-5.0-mac-wk2 -> qt-5.0-wk2 -> qt-5.0 -> qt-mac -> qt
+
+ Reviewed by Dirk Pranke.
+
+ * platform/qt-5.0-mac-wk2/TestExpectations: Added.
+
2012-12-20 Ilya Tikhonovsky <loi...@chromium.org>
Unreviewed, rolling out r138347.
Added: trunk/LayoutTests/platform/qt-5.0-mac-wk2/TestExpectations (0 => 138353)
--- trunk/LayoutTests/platform/qt-5.0-mac-wk2/TestExpectations (rev 0)
+++ trunk/LayoutTests/platform/qt-5.0-mac-wk2/TestExpectations 2012-12-21 09:07:13 UTC (rev 138353)
@@ -0,0 +1,84 @@
+# 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/css-webkit-canvas.html [ Skip ]
+Bug(zalbisser) fast/canvas/webgl/css-webkit-canvas-repaint.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 ]
+
Modified: trunk/Tools/ChangeLog (138352 => 138353)
--- trunk/Tools/ChangeLog 2012-12-21 07:40:23 UTC (rev 138352)
+++ trunk/Tools/ChangeLog 2012-12-21 09:07:13 UTC (rev 138353)
@@ -1,3 +1,20 @@
+2012-12-21 Zeno Albisser <z...@webkit.org>
+
+ [Qt] Add new TestExpectations for qt-5.0-mac-wk2.
+ https://bugs.webkit.org/show_bug.cgi?id=105424
+
+ This change will allow us to run a very specific
+ subset of the available LayoutTests on a mac buildbot.
+ The new baseline search path for mac will look as follows:
+ qt-5.0-mac-wk2 -> qt-5.0-wk2 -> qt-5.0 -> qt-mac -> qt
+
+ Reviewed by Dirk Pranke.
+
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ (QtPort._search_paths):
+ * Scripts/webkitpy/layout_tests/port/qt_unittest.py:
+ (QtPortTest):
+
2012-12-20 Ryuan Choi <ryuan.c...@samsung.com>
[EFL] Build break with latest EFL libraries.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (138352 => 138353)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-12-21 07:40:23 UTC (rev 138352)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-12-21 09:07:13 UTC (rev 138353)
@@ -115,6 +115,8 @@
return version
def _search_paths(self):
+ # qt-5.0-mac-wk2
+ # /
# qt-5.0-wk1 qt-5.0-wk2
# \/
# qt-5.0 qt-4.8
@@ -126,6 +128,8 @@
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-mac-wk2')
search_paths.append('qt-5.0-wk2')
else:
search_paths.append('qt-5.0-wk1')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py (138352 => 138353)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py 2012-12-21 07:40:23 UTC (rev 138352)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py 2012-12-21 09:07:13 UTC (rev 138353)
@@ -50,7 +50,7 @@
{'search_paths':['qt-4.8', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':False},
{'search_paths':['qt-4.8', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':False},
- {'search_paths':['qt-5.0-wk2', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':True, 'qt_version':'5.0'},
+ {'search_paths':['qt-5.0-mac-wk2', 'qt-5.0-wk2', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':True, 'qt_version':'5.0'},
{'search_paths':['qt-5.0-wk2', 'qt-5.0', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':True, 'qt_version':'5.0'},
{'search_paths':['qt-5.0-wk2', 'qt-5.0', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':True, 'qt_version':'5.0'},
