summaryrefslogtreecommitdiffstats
path: root/tests/tests.pro
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-01-16 08:48:55 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-18 23:11:51 +0100
commit886803ab44e82f7437f2f961148de49ca05593a8 (patch)
tree54823c2ed89b7ea999e5c55160a95c3b6bfb94aa /tests/tests.pro
parent1bc046229dcb7eb4fb933d88b206d5dee78dfe92 (diff)
Split shared tests into prebuild and postbuild tests
The qtqa repo contains autotests which are applicable to multiple Qt modules. Split them into tests which can be run prior to building Qt (typically static code checks) and tests which need to be run after building Qt (typically checks on the binaries themselves). The primary benefit of this change is that the static checks can be run much earlier in the test process. Task-number: QTQAINFRA-421 Change-Id: I075bc43e566d5c40322d065b876a11c9a9da84df Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
Diffstat (limited to 'tests/tests.pro')
-rw-r--r--tests/tests.pro15
1 files changed, 6 insertions, 9 deletions
diff --git a/tests/tests.pro b/tests/tests.pro
index 5606d52a..8937d8be 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,13 +1,10 @@
TEMPLATE = subdirs
-SUBDIRS += shared
+SUBDIRS += prebuild postbuild
-# The `shared' directory is a special case. It does _not_ contain autotests
-# specifically for qtqa - rather it contains autotests which may be applied to
+# These tests are a special case. They do _not_ contain autotests
+# specifically for qtqa - rather they contain autotests which may be applied to
# any Qt module. They are not supposed to be run by default when doing
# `make check' in qtqa - if you want to run them, you need to explicitly opt-in
-# by doing `make check' under tests/shared .
-check.CONFIG = recursive
-check.recurse = $$SUBDIRS
-check.recurse -= shared
-check.recurse_target = check
-QMAKE_EXTRA_TARGETS += check
+# by doing `make check' under tests/prebuild or tests/postbuild .
+prebuild.CONFIG += no_check_target
+postbuild.CONFIG += no_check_target