path: root/mkspecs
diff options
authorBradley T. Hughes <>2011-11-14 14:38:38 +0100
committerQt by Nokia <>2011-11-16 10:32:10 +0100
commite2628ef943f5787da92e737ce259db0750154ef7 (patch)
treee9c19ef19938db3d40310c4e125ee0720a9e9095 /mkspecs
parent6fcfae99d3615c7a850e4933691763097078c8e4 (diff)
Make it possible to disable the 'check' target
If subdir.CONFIG contains no_check_target, we do not recurse into that subdir when generating the 'check' target. This will be used to selectively disable crashing tests on Mac OS X. Currently, all autotests are disabled on Mac OS X. The goal is to re- enable them, but not all at once. This approach allows us to get each change through the CI system individually. The first step is get all tests to build, but not run, then we will re-enable the tests for each module, possibly disabling individual tests at the same time. Change-Id: I69f62c238f381ae0315d414cd71d76bc88b088dd Reviewed-by: Bradley T. Hughes <>
Diffstat (limited to 'mkspecs')
1 files changed, 7 insertions, 5 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 44f4b4fc38..874b4bf424 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -44,16 +44,18 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
# Let every project have a standard GNU `check' target
!contains(QMAKE_EXTRA_TARGETS, check) {
# `make check' should iterate through all subdirs
- # (except those with no_default_target)
+ # (except those with no_default_target or no_check_target)
contains(TEMPLATE, subdirs) {
- check.CONFIG = recursive
- check.recurse_target = check
for(subdir, SUBDIRS) {
- !contains(subdir_config, no_default_target):check.recurse += $$subdir
+ !contains(subdir_config, no_check_target):!contains(subdir_config, no_default_target):check.recurse += $$subdir
+ !isEmpty(check.recurse) {
+ # setup the recurse target only when there is to recurse into
+ check.CONFIG = recursive
+ check.recurse_target = check
+ }
# `make check' should imply building the project
else {