diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-12 13:25:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-12 13:25:36 (GMT) |
| commit | 4a0258d58a792172ad8ea67bc9fde1a4dd3b3262 (patch) | |
| tree | 6d71e96064811717fc45fd011fc058bf2b49811c | |
| parent | b6bdf942bf516c9508a6c0407185169063dd94f9 (diff) | |
| parent | 1d340d7cb2183e129f193e9bdbea83347d9a370f (diff) | |
| download | CMake-4a0258d58a792172ad8ea67bc9fde1a4dd3b3262.zip CMake-4a0258d58a792172ad8ea67bc9fde1a4dd3b3262.tar.gz CMake-4a0258d58a792172ad8ea67bc9fde1a4dd3b3262.tar.bz2 | |
Merge topic 'GoogleTest-TYPED_TEST_P'
1d340d7cb2 GoogleTest: Add gtest-filter for TYPED_TEST_P
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7778
| -rw-r--r-- | Modules/GoogleTest.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/GoogleTest.cmake b/Modules/GoogleTest.cmake index f5f4f02..b8dc482 100644 --- a/Modules/GoogleTest.cmake +++ b/Modules/GoogleTest.cmake @@ -348,7 +348,7 @@ function(gtest_add_tests) unset(testList) set(gtest_case_name_regex ".*\\( *([A-Za-z_0-9]+) *, *([A-Za-z_0-9]+) *\\).*") - set(gtest_test_type_regex "(TYPED_TEST|TEST_?[FP]?)") + set(gtest_test_type_regex "(TYPED_TEST|TEST)_?[FP]?") foreach(source IN LISTS ARGS_SOURCES) if(NOT ARGS_SKIP_DEPENDENCY) @@ -361,7 +361,9 @@ function(gtest_add_tests) # Parameterized tests have a different signature for the filter if("x${test_type}" STREQUAL "xTEST_P") - string(REGEX REPLACE ${gtest_case_name_regex} "*/\\1.\\2/*" gtest_test_name ${hit}) + string(REGEX REPLACE ${gtest_case_name_regex} "*/\\1.\\2/*" gtest_test_name ${hit}) + elseif("x${test_type}" STREQUAL "xTYPED_TEST_P") + string(REGEX REPLACE ${gtest_case_name_regex} "*/\\1/*.\\2" gtest_test_name ${hit}) elseif("x${test_type}" STREQUAL "xTEST_F" OR "x${test_type}" STREQUAL "xTEST") string(REGEX REPLACE ${gtest_case_name_regex} "\\1.\\2" gtest_test_name ${hit}) elseif("x${test_type}" STREQUAL "xTYPED_TEST") |