summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2013-07-09 11:14:50 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-10 07:02:10 +0200
commita3dfb4db5f67aaaa3f5acb53418d041f8470f949 (patch)
tree4f2b13b28c50fdb480cd595eb01a39aea032b646 /mkspecs
parentdacf01e43fe80526e2017d1743b70b7b109accaa (diff)
CMake: Fix handling of insignificant_test.
The test should still be run, even though it is insignificant. Change-Id: I6a3853e2b0e9670152b4f329dbceed2986a7e008 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/ctest_testcase_common.prf5
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf
index f033553d3f..2f66909bb4 100644
--- a/mkspecs/features/ctest_testcase_common.prf
+++ b/mkspecs/features/ctest_testcase_common.prf
@@ -9,8 +9,6 @@ win32 {
check.commands =
QMAKE_EXTRA_TARGETS *= check
-insignificant_test: return()
-
isEmpty(CMAKE_VERSION) {
message("cmake executable not found. Not running CMake unit tests")
return()
@@ -94,3 +92,6 @@ check.commands = \
$${CMAKE_MODULE_VERSIONS} \
-DCMAKE_MODULES_UNDER_TEST=\"$$CMAKE_MODULES_UNDER_TEST\" && \
$(TESTRUNNER) ctest --output-on-failure
+
+insignificant_test:!isEmpty(check.commands): \
+ check.commands = -$${check.commands}