diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-04-27 11:06:37 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-27 03:10:06 +0200 |
| commit | 551fd20c19a7c19dd4d0449d64fc7e0a05553f57 (patch) | |
| tree | fb16574362225aa4f24872bd4380c56d39b52f69 | |
| parent | e5a3217349ea03a9615868c562e454e1407bc4c5 (diff) | |
cmake: temporarily set tests/auto/cmake insignificant on mac
cmake was installed on CI macs _after_ this test was added, causing the
test to block unrelated changes. Temporarily disable it as previously
agreed with Stephen Kelly.
Change-Id: I079c0016a5e4a9a03ee1a0bae9a2e836c6b985d6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index 9767914140..1de466bcc0 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -4,6 +4,8 @@ CMAKE_VERSION = $$system(cmake --version) # Cause make to do nothing. TEMPLATE = subdirs +mac:CONFIG+=insignificant_test + check.commands = isEmpty(CMAKE_VERSION) { message("cmake executable not found. Not running CMake unit tests") @@ -47,4 +49,8 @@ isEmpty(CMAKE_VERSION) { } } +insignificant_test:!isEmpty(check.commands) { + check.commands = -$${check.commands} +} + QMAKE_EXTRA_TARGETS *= check |