diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-12 13:25:27 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-12 09:25:35 -0400 |
| commit | 2f2cdb07805de6eb6452ca42cd387e9abe28bc0f (patch) | |
| tree | f29cbb89ca06f1065f9d82885f97cc736794aded | |
| parent | 9adb3fb733aefce5f520ba611c5162164e0e10dc (diff) | |
| parent | 1d340d7cb2183e129f193e9bdbea83347d9a370f (diff) | |
| download | cmake-2f2cdb07805de6eb6452ca42cd387e9abe28bc0f.tar.gz | |
Merge topic 'GoogleTest-TYPED_TEST_P' into release-3.25
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 f5f4f0238c..b8dc482ee4 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") |