From a3dfb4db5f67aaaa3f5acb53418d041f8470f949 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 9 Jul 2013 11:14:50 +0200 Subject: [PATCH] CMake: Fix handling of insignificant_test. The test should still be run, even though it is insignificant. Change-Id: I6a3853e2b0e9670152b4f329dbceed2986a7e008 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/ctest_testcase_common.prf | 5 +++-- 1 file 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}