Bug 97894 - [Qt] Make NRWT use wk2/TestExpectations file
Summary: [Qt] Make NRWT use wk2/TestExpectations file
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P1 Blocker
Assignee: Csaba Osztrogonác
URL:
Keywords: Qt, QtTriaged
Depends on:
Blocks:
 
Reported: 2012-09-28 04:48 PDT by Csaba Osztrogonác
Modified: 2012-09-28 12:24 PDT (History)
7 users (show)

See Also:

Attachments
Patch (4.34 KB, patch)
2012-09-28 05:25 PDT, Csaba Osztrogonác 		no flags Details | Formatted Diff | Diff
updated patch (4.95 KB, patch)
2012-09-28 06:21 PDT, Csaba Osztrogonác 		no flags Details | Formatted Diff | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Csaba Osztrogonác 2012-09-28 04:48:37 PDT 
After https://trac.webkit.org/changeset/129788 many tests starting to fail on 
Qt WK2, because now NRWT uses only wk2/Skipped file, but not wk2/TestExpectations.

Fix is coming soon.
Comment 1 Csaba Osztrogonác 2012-09-28 05:25:23 PDT 
Created attachment 166224 [details]
Patch
Comment 2 Csaba Osztrogonác 2012-09-28 05:29:22 PDT 
Additionally I removed the unnecessary skip list functions.
Comment 3 Peter Gal 2012-09-28 05:56:30 PDT 
View in context: https://bugs.webkit.org/attachment.cgi?id=166224&action=review

> Tools/Scripts/webkitpy/layout_tests/port/qt.py:148
> +        if self.get_option('webkit_test_runner'):
> +            paths.append('wk2')

Here is a loss of check for Qt 5.0, but if the webkit_test_runner is true it is wk2 by default. Am I right?

> Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:98
> +            if case['use_webkit2']:
> +                case['search_paths'].append("wk2")

This could lead to some strange things if I'm not mistaken. Like: if the test_baseline_search_path method executes after this.
Comment 4 Csaba Osztrogonác 2012-09-28 06:21:17 PDT 
(In reply to comment #3)
> View in context: https://bugs.webkit.org/attachment.cgi?id=166224&action=review
> 
> > Tools/Scripts/webkitpy/layout_tests/port/qt.py:148
> > +        if self.get_option('webkit_test_runner'):
> > +            paths.append('wk2')
> 
> Here is a loss of check for Qt 5.0, but if the webkit_test_runner is true it is wk2 by default. Am I right?

WK2 build is impossible with Qt 4.8, so running WK2 test with Qt 4.8 
will fail because of missing WTR, search path won't be real problem. :)

> > Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py:98
> > +            if case['use_webkit2']:
> > +                case['search_paths'].append("wk2")
> 
> This could lead to some strange things if I'm not mistaken. Like: if the test_baseline_search_path method executes after this.

Good point. Will fix.
Comment 5 Csaba Osztrogonác 2012-09-28 06:21:32 PDT 
Created attachment 166237 [details]
updated patch
Comment 6 Peter Gal 2012-09-28 06:27:34 PDT 
(In reply to comment #5)
> Created an attachment (id=166237) [details]
> updated patch

LBTM :)
Comment 7 Simon Hausmann 2012-09-28 06:43:07 PDT 
Comment on attachment 166237 [details]
updated patch

rs=me
Comment 8 Csaba Osztrogonác 2012-09-28 06:47:08 PDT 
Comment on attachment 166237 [details]
updated patch

Clearing flags on attachment: 166237

Committed r129887: <http://trac.webkit.org/changeset/129887>
Comment 9 Csaba Osztrogonác 2012-09-28 06:47:14 PDT 
All reviewed patches have been landed.  Closing bug.
Comment 10 Dirk Pranke 2012-09-28 12:24:22 PDT 
Sorry about this ... I forgot to check the Qt waterfall for failures :(.