[Qt] [Gardening] Remove qt-4.7 layout tests dir
authoralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Dec 2011 12:50:47 +0000 (12:50 +0000)
committeralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Dec 2011 12:50:47 +0000 (12:50 +0000)
https://bugs.webkit.org/show_bug.cgi?id=74426

Building trunk now depends on Qt >= 4.8, so no need to keep this directory
on the tree.

Patch by João Paulo Rechi Vita <jprvita@openbossa.org> on 2011-12-14
Reviewed by Csaba Osztrogonác.

Tools:

* Scripts/webkitpy/layout_tests/port/qt.py:
(QtPort.qt_version):
(QtPort.baseline_search_path):
(QtPort._skipped_file_search_paths):
* Scripts/webkitpy/layout_tests/port/qt_unittest.py:
(QtPortTest._assert_search_path):

LayoutTests:

* platform/qt-4.7/Skipped: Removed.

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

LayoutTests/ChangeLog
LayoutTests/platform/qt-4.7/Skipped [deleted file]
Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/port/qt.py
Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py

index 3bdc118..289561b 100644 (file)
@@ -1,3 +1,15 @@
+2011-12-14  João Paulo Rechi Vita  <jprvita@openbossa.org>
+
+        [Qt] [Gardening] Remove qt-4.7 layout tests dir
+        https://bugs.webkit.org/show_bug.cgi?id=74426
+
+        Building trunk now depends on Qt >= 4.8, so no need to keep this directory
+        on the tree.
+
+        Reviewed by Csaba Osztrogonác.
+
+        * platform/qt-4.7/Skipped: Removed.
+
 2011-12-14  Philippe Normand  <pnormand@igalia.com>
 
         Unreviewed, skip 2 tests failing on 32-bit GTK bot.
diff --git a/LayoutTests/platform/qt-4.7/Skipped b/LayoutTests/platform/qt-4.7/Skipped
deleted file mode 100644 (file)
index e69de29..0000000
index c492cfb..3d14660 100644 (file)
@@ -1,3 +1,20 @@
+2011-12-14  João Paulo Rechi Vita  <jprvita@openbossa.org>
+
+        [Qt] [Gardening] Remove qt-4.7 layout tests dir
+        https://bugs.webkit.org/show_bug.cgi?id=74426
+
+        Building trunk now depends on Qt >= 4.8, so no need to keep this directory
+        on the tree.
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/webkitpy/layout_tests/port/qt.py:
+        (QtPort.qt_version):
+        (QtPort.baseline_search_path):
+        (QtPort._skipped_file_search_paths):
+        * Scripts/webkitpy/layout_tests/port/qt_unittest.py:
+        (QtPortTest._assert_search_path):
+
 2011-12-14  Kentaro Hara  <haraken@chromium.org>
 
         [Refactoring] In prepare-ChangeLog, make $isGit and $isSVN be used only
index a1dbcb2..eb23e53 100644 (file)
@@ -109,7 +109,7 @@ class QtPort(WebKitPort):
                     version = match.group('version')
                     break
         except OSError:
-            version = '4.7'
+            version = '4.8'
         return version
 
     def baseline_search_path(self):
@@ -118,9 +118,7 @@ class QtPort(WebKitPort):
             search_paths.append(self._wk2_port_name())
         search_paths.append(self.name())
         version = self.qt_version()
-        if '4.7' in version:
-            search_paths.append('qt-4.7')
-        elif '4.8' in version:
+        if '4.8' in version:
             search_paths.append('qt-4.8')
         elif version:
             search_paths.append('qt-5.0')
@@ -130,9 +128,7 @@ class QtPort(WebKitPort):
     def _skipped_file_search_paths(self):
         search_paths = set([self.port_name, self.name()])
         version = self.qt_version()
-        if '4.7' in version:
-            search_paths.add('qt-4.7')
-        elif '4.8' in version:
+        if '4.8' in version:
             search_paths.add('qt-4.8')
         elif version:
             search_paths.add('qt-5.0')
index d644632..f6c130c 100644 (file)
@@ -41,7 +41,7 @@ from webkitpy.common.host_mock import MockHost
 class QtPortTest(port_testcase.PortTestCase):
     port_maker = QtPort
 
-    def _assert_search_path(self, search_paths, sys_platform, use_webkit2=False, qt_version='4.7'):
+    def _assert_search_path(self, search_paths, sys_platform, use_webkit2=False, qt_version='4.8'):
         # FIXME: Port constructors should not "parse" the port name, but
         # rather be passed components (directly or via setters).  Once
         # we fix that, this method will need a re-write.
@@ -53,26 +53,24 @@ class QtPortTest(port_testcase.PortTestCase):
         self.assertEquals(port.baseline_search_path(), absolute_search_paths)
 
     def _qt_version(self, qt_version):
-        if qt_version in '4.7':
-            return 'QMake version 2.01a\nUsing Qt version 4.7.3 in /usr/local/Trolltech/Qt-4.7.3/lib'
         if qt_version in '4.8':
             return 'QMake version 2.01a\nUsing Qt version 4.8.0 in /usr/local/Trolltech/Qt-4.8.2/lib'
         if qt_version in '5.0':
             return 'QMake version 2.01a\nUsing Qt version 5.0.0 in /usr/local/Trolltech/Qt-5.0.0/lib'
 
     def test_baseline_search_path(self):
-        self._assert_search_path(['qt-mac', 'qt-4.7', 'qt'], 'darwin')
-        self._assert_search_path(['qt-win', 'qt-4.7', 'qt'], 'win32')
-        self._assert_search_path(['qt-win', 'qt-4.7', 'qt'], 'cygwin')
-        self._assert_search_path(['qt-linux', 'qt-4.7', 'qt'], 'linux2')
-        self._assert_search_path(['qt-linux', 'qt-4.7', 'qt'], 'linux3')
-
         self._assert_search_path(['qt-mac', 'qt-4.8', 'qt'], 'darwin', qt_version='4.8')
         self._assert_search_path(['qt-win', 'qt-4.8', 'qt'], 'win32', qt_version='4.8')
         self._assert_search_path(['qt-win', 'qt-4.8', 'qt'], 'cygwin', qt_version='4.8')
         self._assert_search_path(['qt-linux', 'qt-4.8', 'qt'], 'linux2', qt_version='4.8')
         self._assert_search_path(['qt-linux', 'qt-4.8', 'qt'], 'linux3', qt_version='4.8')
 
+        self._assert_search_path(['qt-mac', 'qt-4.8', 'qt'], 'darwin')
+        self._assert_search_path(['qt-win', 'qt-4.8', 'qt'], 'win32')
+        self._assert_search_path(['qt-win', 'qt-4.8', 'qt'], 'cygwin')
+        self._assert_search_path(['qt-linux', 'qt-4.8', 'qt'], 'linux2')
+        self._assert_search_path(['qt-linux', 'qt-4.8', 'qt'], 'linux3')
+
         self._assert_search_path(['qt-wk2', 'qt-mac', 'qt-5.0', 'qt'], 'darwin', use_webkit2=True, qt_version='5.0')
         self._assert_search_path(['qt-wk2', 'qt-win', 'qt-5.0', 'qt'], 'cygwin', use_webkit2=True, qt_version='5.0')
         self._assert_search_path(['qt-wk2', 'qt-linux', 'qt-5.0', 'qt'], 'linux2', use_webkit2=True, qt_version='5.0')