path: root/tests/
diff options
authorBradley T. Hughes <>2011-11-14 14:43:32 +0100
committerQt by Nokia <>2011-11-17 01:20:39 +0100
commit577feb71ca98021804bd0111858a48f8421e08f0 (patch)
tree2f13654d37eb6700001e57c6205da9f801f371f5 /tests/
parent45d37022956238273d1afcd7f2083c844987e933 (diff)
Build all tests on Mac OS X, but do not run them yet.
Previously, autotests and benchmarks were disabled on Mac OS X. This is wrong, and needs to be corrected. The 'make check' target is disabled for the autotests on Mac OS X for now, but all tests will now be built. The check target does not actually run the benchmarks, so this can be safely re-enabled without breaking the CI system. There will be commits to follow which re-enable the 'make check' target on Mac OS X for each module. Change-Id: I1347da46e3688b48e8cc5d933ee5188ea3723639 Reviewed-by: Rohan McGovern <>
Diffstat (limited to 'tests/')
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/ b/tests/
index 7e129e0b5e..ead5f80e89 100644
--- a/tests/
+++ b/tests/
@@ -1,8 +1,9 @@
TEMPLATE = subdirs
-!mac {
SUBDIRS = auto
# benchmarks in debug mode is rarely sensible
# benchmarks are not sensible for code coverage (here with tool testcocoon)
!testcocoon:contains(QT_CONFIG,release):SUBDIRS += benchmarks
+# disable 'make check' on Mac OS X for the time being
+mac: auto.CONFIG += no_check_target