Bug 36756 - [Qt] unit tests don't compile inside of Qt
Summary: [Qt] unit tests don't compile inside of Qt
Status: CLOSED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Major
Assignee: Simon Hausmann
URL:
Keywords: Qt
Depends on:
Blocks: 35784
  Show dependency treegraph
 
Reported: 2010-03-29 07:44 PDT by Simon Hausmann
Modified: 2010-03-29 07:52 PDT (History)
0 users

See Also:


Attachments
Patch (1.05 KB, patch)
2010-03-29 07:46 PDT, Simon Hausmann
vestbo: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Simon Hausmann 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.
Comment 1 Simon Hausmann 2010-03-29 07:46:08 PDT
Created attachment 51908 [details]
Patch
Comment 2 Simon Hausmann 2010-03-29 07:49:34 PDT
Committed r56721: <http://trac.webkit.org/changeset/56721>
Comment 3 Simon Hausmann 2010-03-29 07:52:05 PDT
Revision r56721 cherry-picked into qtwebkit-2.0 with commit d7edf81626b61240f3fe37f1742cf85d93760110