Bug 74426 - [Qt] [Gardening] Remove qt-4.7 layout tests dir
Summary: [Qt] [Gardening] Remove qt-4.7 layout tests dir
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P3 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-12-13 11:15 PST by João Paulo Rechi Vita
Modified: 2011-12-14 04:51 PST (History)
5 users (show)

See Also:


Attachments
Remove qt-4.7 layout tests dir (654 bytes, patch)
2011-12-13 11:32 PST, João Paulo Rechi Vita
ossy: review-
Details | Formatted Diff | Diff
Remove qt-4.7 layout tests dir (4.99 KB, patch)
2011-12-13 12:54 PST, João Paulo Rechi Vita
ossy: review-
Details | Formatted Diff | Diff
Remove qt-4.7 layout tests dir (5.26 KB, patch)
2011-12-14 04:02 PST, João Paulo Rechi Vita
no flags Details | Formatted Diff | Diff
Remove qt-4.7 layout tests dir (5.76 KB, patch)
2011-12-14 04:09 PST, João Paulo Rechi Vita
ossy: review+
ossy: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description João Paulo Rechi Vita 2011-12-13 11:15:16 PST
Building trunk now depends on Qt >= 4.8, so no need to keep this directory on the tree.
Comment 1 João Paulo Rechi Vita 2011-12-13 11:32:24 PST
Created attachment 119052 [details]
Remove qt-4.7 layout tests dir
Comment 2 Alexis Menard (darktears) 2011-12-13 11:40:49 PST
Comment on attachment 119052 [details]
Remove qt-4.7 layout tests dir

Talking with jprvita we remove the cq flag for now.
Comment 3 Alexis Menard (darktears) 2011-12-13 11:45:18 PST
(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.
Comment 4 Csaba Osztrogonác 2011-12-13 11:55:11 PST
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.
Comment 5 João Paulo Rechi Vita 2011-12-13 12:54:52 PST
Created attachment 119070 [details]
Remove qt-4.7 layout tests dir
Comment 6 Csaba Osztrogonác 2011-12-13 22:56:55 PST
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.
Comment 7 João Paulo Rechi Vita 2011-12-14 04:02:58 PST
Created attachment 119195 [details]
Remove qt-4.7 layout tests dir
Comment 8 João Paulo Rechi Vita 2011-12-14 04:05:10 PST
Comment on attachment 119195 [details]
Remove qt-4.7 layout tests dir

Oops, wrong version.
Comment 9 João Paulo Rechi Vita 2011-12-14 04:09:15 PST
Created attachment 119196 [details]
Remove qt-4.7 layout tests dir
Comment 10 Csaba Osztrogonác 2011-12-14 04:43:07 PST
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.
Comment 11 Alexis Menard (darktears) 2011-12-14 04:51:04 PST
Committed r102766: <http://trac.webkit.org/changeset/102766>