AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only run tests for the default exclusive builds target

Browse Source 
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>
This commit is contained in:
Tor Arne Vestbø 2015-03-02 18:14:04 +01:00
parent d758c115e4
commit c006bcc636
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mkspecs/features/testcase.prf
View File

@ -52,25 +52,18 @@ insignificant_test:check.commands = -$${check.commands}
QMAKE_EXTRA_TARGETS *= check QMAKE_EXTRA_TARGETS *= check
!debug_and_release|build_pass { isEmpty(BUILDS)|build_pass {
check.depends = first check.depends = first
} else { } else {
# For exclusive builds, only run the test once.
check.CONFIG = recursive check.CONFIG = recursive
# In debug and release mode, only run the test once. check.target = check_all
# Run debug if that is the preferred config, release otherwise.
debug_and_release {
check.target = dummy_check
check.recurse_target = check check.recurse_target = check
CONFIG(debug, debug|release) { check.commands =
real_check.depends = debug-check
real_check.target = check check_first.depends = $$eval($$first(BUILDS).target)-check
QMAKE_EXTRA_TARGETS += real_check check_first.target = check
} else { QMAKE_EXTRA_TARGETS += check_first
real_check.depends = release-check
real_check.target = check
QMAKE_EXTRA_TARGETS += real_check
}
}
} }
!no_testcase_installs:!contains(INSTALLS, target) { !no_testcase_installs:!contains(INSTALLS, target) {