diff options
author | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-03-02 18:14:04 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-03-12 10:11:35 +0000 |
commit | c006bcc636c57daabd6f9ca0094708e37b379258 (patch) | |
tree | d244d93c4f0bf69da9ec353fd551e7570e32e736 /mkspecs/features | |
parent | d758c115e47ce17813523c6c7ecf52581791541d (diff) |
Only run tests for the default exclusive builds target
We now have support for more complex exclusive builds configurations,
e.g., on iOS with simulator and device configurations, so we can't hard
code the logic for choosing the right exclusive build to test.
Change-Id: I358687b297b7bf1eb28eef0ef0aaf44b89860404
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/testcase.prf | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index c77f3b70ab..a6ef930128 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -52,25 +52,18 @@ insignificant_test:check.commands = -$${check.commands} QMAKE_EXTRA_TARGETS *= check -!debug_and_release|build_pass { +isEmpty(BUILDS)|build_pass { check.depends = first } else { + # For exclusive builds, only run the test once. check.CONFIG = recursive - # In debug and release mode, only run the test once. - # Run debug if that is the preferred config, release otherwise. - debug_and_release { - check.target = dummy_check - check.recurse_target = check - CONFIG(debug, debug|release) { - real_check.depends = debug-check - real_check.target = check - QMAKE_EXTRA_TARGETS += real_check - } else { - real_check.depends = release-check - real_check.target = check - QMAKE_EXTRA_TARGETS += real_check - } - } + check.target = check_all + check.recurse_target = check + check.commands = + + check_first.depends = $$eval($$first(BUILDS).target)-check + check_first.target = check + QMAKE_EXTRA_TARGETS += check_first } !no_testcase_installs:!contains(INSTALLS, target) { |