[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 51e6f40a9209a860e6d0582b7247012ef45de93d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 14:37:32 2010 +0000

    2010-10-27  Gabor Rapcsanyi  <rgabor at inf.u-szeged.hu>
    
            Reviewed by Csaba Osztrogonác.
    
            [NRWT] Add platform specific baseline search paths for Qt port
            https://bugs.webkit.org/show_bug.cgi?id=48428
    
            * Scripts/webkitpy/layout_tests/port/qt.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70643 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index da5e2f4..7d92969 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-27  Gabor Rapcsanyi  <rgabor at inf.u-szeged.hu>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [NRWT] Add platform specific baseline search paths for Qt port
+        https://bugs.webkit.org/show_bug.cgi?id=48428
+
+        * Scripts/webkitpy/layout_tests/port/qt.py:
+
 2010-10-27  Adam Roben  <aroben at apple.com>
 
         Catch exceptions when checking if we're inside a git working directory
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py
index ab31690..af94acc 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py
@@ -31,6 +31,7 @@
 import logging
 import os
 import signal
+import sys
 
 import webkit
 
@@ -46,6 +47,17 @@ class QtPort(WebKitPort):
         kwargs.setdefault('port_name', 'qt')
         WebKitPort.__init__(self, **kwargs)
 
+    def baseline_search_path(self):
+        port_names = []
+        if sys.platform == 'linux2':
+            port_names.append("qt-linux")
+        elif sys.platform in ('win32', 'cygwin'):
+            port_names.append("qt-win")
+        elif sys.platform == 'darwin':
+            port_names.append("qt-mac")
+        port_names.append("qt")
+        return map(self._webkit_baseline_path, port_names)
+
     def _tests_for_other_platforms(self):
         # FIXME: This list could be dynamic based on platform name and
         # pushed into base.Port.

-- 
WebKit Debian packaging