diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-04-27 14:30:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-01 07:10:23 +0200 |
| commit | aa17350eb697d71f75f6e9ccf07852d078334b40 (patch) | |
| tree | 3997d548f11c629acd08d7774ee42032400c5af1 /tests | |
| parent | 31b0a373063a9980b094bde71457e19e046e6a14 (diff) | |
Never attempt to run the dbus tests on APPLE.
The Qt buildsystem is creating the config files for it even
when it is not building QtDBus, so Qt5DBus_FOUND = True.
Re-enable the CI testing on mac with this change.
Task-number: QTBUG-25522
Change-Id: I5d2690d17fde6c5aabcbdd3e2eef9f0846edd97d
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 49aaaa282b..b9b0e8c605 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -95,6 +95,6 @@ expect_pass(pass8) # If QtDBus has been installed then run the tests for its macros. find_package(Qt5DBus QUIET) -if (Qt5DBus_FOUND) +if (Qt5DBus_FOUND AND NOT APPLE) expect_pass(pass9) endif() diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index 1de466bcc0..0fe999b957 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -4,8 +4,6 @@ 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") |