diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-03-03 23:38:54 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-03-03 23:46:50 (GMT) |
| commit | 243fa0427cfb9878c39946dcf5429aab581c47c3 (patch) | |
| tree | 578023f43b7989f689aba49d3278b12aaa3a024f /mkspecs | |
| parent | 9e5cc0da3cdcf3ddddc35dc78e670994237a180f (diff) | |
| download | Qt-243fa0427cfb9878c39946dcf5429aab581c47c3.zip Qt-243fa0427cfb9878c39946dcf5429aab581c47c3.tar.gz Qt-243fa0427cfb9878c39946dcf5429aab581c47c3.tar.bz2 | |
Make `make check' build the checked project.
The `check' rule ought to depend on the project being built, so one
can simply do `make check' instead of `make && make check'.
Note that there was already an attempt to do this for the autotests,
but it did not work on non-Windows platforms, because
$(DESTDIR_TARGET) is only used in the Windows makefile generators.
Reviewed-By: Lincoln Ramsay
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/default_post.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 155bfc3..d844385 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -17,5 +17,9 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST check.recurse = $$SUBDIRS check.recurse_target = check } + # `make check' should imply building the project + else { + check.depends = first + } QMAKE_EXTRA_TARGETS += check } diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index 53c0d74..e3faef1 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -27,7 +27,7 @@ embedded: check.commands += -qws QMAKE_EXTRA_TARGETS += check !debug_and_release|build_pass { - check.depends = $(DESTDIR_TARGET) + check.depends = first } else { check.CONFIG = recursive # In debug and release mode, only run the test once. |