summaryrefslogtreecommitdiffstats
path: root/tests/tests.pro
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-09-14 13:15:17 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-15 01:02:58 +0200
commit7222f12530a83488b887927a9560a766cce1179f (patch)
treecaf6368bf40b3192426109492d2ee33c113f33d8 /tests/tests.pro
parenta17e3942f428429d5da520d6ca8593cbb1059176 (diff)
Move qtqa shared tests to tests/shared.
Having these tests under tests/auto is misleading: usually this directory contains tests for the containing module, but these tests are intended to be shared tests for _all_ Qt modules. Move them to tests/shared instead to make this difference clearer. Note the tests are now compiled by default, but not run by default. To run these tests, it's necessary to explicitly opt-in by doing a `make check' under the tests/shared directory. Change-Id: I42559710de8e70b708612da45c366d8d00e16ad6 Reviewed-on: http://codereview.qt-project.org/4855 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/tests.pro')
-rw-r--r--tests/tests.pro13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/tests.pro b/tests/tests.pro
index 85e4f3a5..5606d52a 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,13 @@
TEMPLATE = subdirs
-SUBDIRS += auto
+SUBDIRS += shared
+
+# The `shared' directory is a special case. It does _not_ contain autotests
+# specifically for qtqa - rather it contains 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