Bug 74426 – [Qt] [Gardening] Remove qt-4.7 layout tests dir

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[João Paulo Rechi Vita]

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

[João Paulo Rechi Vita]

Created attachment 119052 [details]
Remove qt-4.7 layout tests dir

[Alexis Menard (darktears)]

Comment on attachment 119052 [details]
Remove qt-4.7 layout tests dir

Talking with jprvita we remove the cq flag for now.

[Alexis Menard (darktears)]

(In reply to comment #2)
> (From update of attachment 119052 [details])
> Talking with jprvita we remove the cq flag for now.

When we get the r+ I will land the patch manually as removing the dir seems to not work very well with webkit-patch.

[Csaba Osztrogonác]

Comment on attachment 119052 [details]
Remove qt-4.7 layout tests dir

Thanks for this gardening. Please remove Qt 4.7 support from NRWT and its unit test too.

[João Paulo Rechi Vita]

Created attachment 119070 [details]
Remove qt-4.7 layout tests dir

[Csaba Osztrogonác]

Comment on attachment 119070 [details]
Remove qt-4.7 layout tests dir

View in context: https://bugs.webkit.org/attachment.cgi?id=119070&action=review

> Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:-68
> -        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')

These lines shouldn't be removed, because we should check the 
default qt_version too, which became '4.8' with this patch.
So please change qt-4.7 to qt-4.8, and I'll r+ the patch,
and land it manually, because svn-apply doesn't like
removed files in a patch.

[João Paulo Rechi Vita]

Created attachment 119195 [details]
Remove qt-4.7 layout tests dir

[João Paulo Rechi Vita]

Comment on attachment 119195 [details]
Remove qt-4.7 layout tests dir

Oops, wrong version.

[João Paulo Rechi Vita]

Created attachment 119196 [details]
Remove qt-4.7 layout tests dir

[Csaba Osztrogonác]

Comment on attachment 119196 [details]
Remove qt-4.7 layout tests dir

View in context: https://bugs.webkit.org/attachment.cgi?id=119196&action=review

r=me with a little change. I'll land it manually.

> Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:-74
> -        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')

We need these lines too.

[Alexis Menard (darktears)]

Committed r102766: <http://trac.webkit.org/changeset/102766>