kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FindGTest: Fix parsing of test macro calls with spaces (#15553) 

Tolerate spaces before the open paren and after the test name before the
comma.
This commit is contained in:
Brad King 2015-05-04 11:23:30 -04:00
parent d3b36a90b6
commit 0f927b440a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindGTest.cmake
View File

@ -115,11 +115,11 @@ function(GTEST_ADD_TESTS executable extra_args)
# obtain sources used for building that executable # obtain sources used for building that executable
get_property(ARGN TARGET ${executable} PROPERTY SOURCES) get_property(ARGN TARGET ${executable} PROPERTY SOURCES)
endif() endif()
set(gtest_case_name_regex ".*\\( *([A-Za-z_0-9]+), *([A-Za-z_0-9]+) *\\).*") 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 ${ARGN}) foreach(source ${ARGN})
file(READ "${source}" contents) file(READ "${source}" contents)
string(REGEX MATCHALL "${gtest_test_type_regex}\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents}) string(REGEX MATCHALL "${gtest_test_type_regex} *\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
foreach(hit ${found_tests}) foreach(hit ${found_tests})
string(REGEX MATCH "${gtest_test_type_regex}" test_type ${hit}) string(REGEX MATCH "${gtest_test_type_regex}" test_type ${hit})