summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-11-08 14:17:52 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-11-08 14:18:01 (GMT)
commit7e0c00c25117c85e98666fc07eb07a2e53a59e33 (patch)
tree61d06022571a3ab45849fcfc96faa79ced593b03 /Modules
parent6c48f5dbc0ad25a80922f11951ebeef7f6b85f73 (diff)
parentf54963e60f3718bfb3d526097252dcf64fa2f34f (diff)
downloadCMake-7e0c00c25117c85e98666fc07eb07a2e53a59e33.zip
CMake-7e0c00c25117c85e98666fc07eb07a2e53a59e33.tar.gz
CMake-7e0c00c25117c85e98666fc07eb07a2e53a59e33.tar.bz2
Merge topic 'googletest-addtests-skipped'
f54963e60f GoogleTest: Reports skipped test with gtest_add_tests Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7868
Diffstat (limited to 'Modules')
-rw-r--r--Modules/GoogleTest.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/GoogleTest.cmake b/Modules/GoogleTest.cmake
index b8dc482..79e9437 100644
--- a/Modules/GoogleTest.cmake
+++ b/Modules/GoogleTest.cmake
@@ -405,6 +405,12 @@ function(gtest_add_tests)
--gtest_filter=${gtest_test_name}
${ARGS_EXTRA_ARGS}
)
+ # Makes sure a skipped GTest is reported as so by CTest
+ set_tests_properties(
+ ${ctest_test_name}
+ PROPERTIES
+ SKIP_REGULAR_EXPRESSION "\\[ SKIPPED \\]"
+ )
list(APPEND testList ${ctest_test_name})
endif()
endforeach()