Bug 36756

Summary: [Qt] unit tests don't compile inside of Qt
Product: WebKit Reporter: Simon Hausmann <hausmann>
Component: Tools / TestsAssignee: Simon Hausmann <hausmann>
Status: CLOSED FIXED    
Severity: Major Keywords: Qt
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: All   
OS: All   
Bug Depends on:    
Bug Blocks: 35784    
Attachments:
Description Flags
Patch vestbo: review+

Simon Hausmann
Reported 2010-03-29 07:44:22 PDT
The current unit tests don't compile inside of Qt. * tests.pri adds a tst prefix to all unit tests. qttest_p4.prf does the same thing, so we end up with tst_tst_qwebpage. This can be fixed by omitting the substitution for QTDIR builds. * tests.pri adds $$_PRO_FILE_PWD_/foo.cpp to SOURCES. For builds inside Qt the .pro file is separate and the sources are pulled in using VPATH. By adding $$_PRO_FILE_PWD_ to the VPATH we can use a relative name, so that for trunk builds tst_qwebpage.cpp is found in WebKit/qt/tests/qwebpage and for builds inside Qt, too, through VPATH.
Attachments
Patch (1.05 KB, patch)
2010-03-29 07:46 PDT, Simon Hausmann 		vestbo: review+
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Simon Hausmann
Comment 1 2010-03-29 07:46:08 PDT
Created attachment 51908 [details] Patch
Simon Hausmann
Comment 2 2010-03-29 07:49:34 PDT
Committed r56721: <http://trac.webkit.org/changeset/56721>
Simon Hausmann
Comment 3 2010-03-29 07:52:05 PDT
Revision r56721 cherry-picked into qtwebkit-2.0 with commit d7edf81626b61240f3fe37f1742cf85d93760110
Note You need to log in before you can comment on or make changes to this bug.