[Qt] Remove qt-5.0-wk2 from the baseline search paths because the migration of expect...

https://bugs.webkit.org/show_bug.cgi?id=120464

Patch by Gabor Abraham <abrhm@inf.u-szeged.hu> on 2013-08-30
Reviewed by Jocelyn Turcotte.

* Scripts/webkitpy/port/qt.py:
(QtPort._search_paths):
* Scripts/webkitpy/port/qt_unittest.py:
(QtPortTest):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 504644bdbdda40aaa137f5c6d8b66e656cef36a2..eca8afb99792ee51fb63e0db0f0cc9d70ce4adfe 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2013-08-30  Gabor Abraham  <abrhm@inf.u-szeged.hu>
+
+        [Qt] Remove qt-5.0-wk2 from the baseline search paths because the migration of expectations to qt-wk2 is done.
+        https://bugs.webkit.org/show_bug.cgi?id=120464
+
+        Reviewed by Jocelyn Turcotte.
+
+        * Scripts/webkitpy/port/qt.py:
+        (QtPort._search_paths):
+        * Scripts/webkitpy/port/qt_unittest.py:
+        (QtPortTest):
+
 2013-08-29  Filip Pizlo  <fpizlo@apple.com>
 
         Just linking LLVM into JSC causes all plugin tests to fail

diff --git a/Tools/Scripts/webkitpy/port/qt.py b/Tools/Scripts/webkitpy/port/qt.py
index 6d82d545cfe2171432ce12b12a2d86534ab0bc3a..5db5d8eea6e6185720eabe5bbfb78839805c556b 100644 (file)
--- a/Tools/Scripts/webkitpy/port/qt.py
+++ b/Tools/Scripts/webkitpy/port/qt.py
@@ -131,8 +131,6 @@ class QtPort(Port):
             if self.operating_system() == 'mac':
                 search_paths.append('qt-mac-wk2')
             search_paths.append('qt-wk2')
-            # FIXME: Remove qt-5.0-wk2 when migration of expectations to qt-wk2 is done.
-            search_paths.append('qt-5.0-wk2')
         else:
             search_paths.append('qt-wk1')
 

diff --git a/Tools/Scripts/webkitpy/port/qt_unittest.py b/Tools/Scripts/webkitpy/port/qt_unittest.py
index 0f0f5f17cc8a42a65f7271193f118ba84deb5d89..2338f673be95bac206f3a2c7b937ea859bea304c 100644 (file)
--- a/Tools/Scripts/webkitpy/port/qt_unittest.py
+++ b/Tools/Scripts/webkitpy/port/qt_unittest.py
@@ -42,9 +42,9 @@ class QtPortTest(port_testcase.PortTestCase):
     port_name = 'qt-mac'
     port_maker = QtPort
     search_paths_cases = [
-        {'search_paths':['qt-mac-wk2', 'qt-wk2', 'qt-5.0-wk2', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':True, 'qt_version':'5.0'},
-        {'search_paths':['qt-wk2', 'qt-5.0-wk2', 'qt-5.0', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':True, 'qt_version':'5.0'},
-        {'search_paths':['qt-wk2', 'qt-5.0-wk2', 'qt-5.0', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':True, 'qt_version':'5.0'},
+        {'search_paths':['qt-mac-wk2', 'qt-wk2', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':True, 'qt_version':'5.0'},
+        {'search_paths':['qt-wk2', 'qt-5.0', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':True, 'qt_version':'5.0'},
+        {'search_paths':['qt-wk2', 'qt-5.0', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':True, 'qt_version':'5.0'},
 
         {'search_paths':['qt-wk1', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':False, 'qt_version':'5.0'},
         {'search_paths':['qt-wk1', 'qt-5.0', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':False, 'qt_version':'5.0'},