diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-09-11 13:42:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-11 13:42:31 (GMT) |
| commit | 344eb9c8dc3b16a524729cb66ad25fc1c127a02c (patch) | |
| tree | 17d4cc25df3085bb4a775282fe243457e1b96da5 | |
| parent | 528d7625b89e0343bbf541edd256971493a6e455 (diff) | |
| parent | 31c82143bfdb1d9bc5e6282f3341fc09a0ab2234 (diff) | |
| download | CMake-344eb9c8dc3b16a524729cb66ad25fc1c127a02c.zip CMake-344eb9c8dc3b16a524729cb66ad25fc1c127a02c.tar.gz CMake-344eb9c8dc3b16a524729cb66ad25fc1c127a02c.tar.bz2 | |
Merge topic 'gtest_add_tests-empty-file'
31c82143bf GoogleTest: gtest_add_tests() fails if any source file is empty
d6b06d8d87 GoogleTest: Modify test to verify that empty files can be scanned
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2342
| -rw-r--r-- | Modules/GoogleTest.cmake | 2 | ||||
| -rw-r--r-- | Tests/GoogleTest/Test/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/GoogleTest/Test/empty.cxx | 0 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Modules/GoogleTest.cmake b/Modules/GoogleTest.cmake index 2c9ee11..a5bb863 100644 --- a/Modules/GoogleTest.cmake +++ b/Modules/GoogleTest.cmake @@ -308,7 +308,7 @@ function(gtest_add_tests) set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${source}) endif() 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}) string(REGEX MATCH "${gtest_test_type_regex}" test_type ${hit}) diff --git a/Tests/GoogleTest/Test/CMakeLists.txt b/Tests/GoogleTest/Test/CMakeLists.txt index f798d31..baf00d5 100644 --- a/Tests/GoogleTest/Test/CMakeLists.txt +++ b/Tests/GoogleTest/Test/CMakeLists.txt @@ -44,12 +44,13 @@ endif() set_tests_properties(set2.GoogleTest.ConditionalFail.foo PROPERTIES WILL_FAIL YES) -# Search specific sources to get the test list -add_executable(test_gtest2 main2.cxx) +# Search specific sources to get the test list. Include an empty file +# to ensure they are handled correctly too. +add_executable(test_gtest2 main2.cxx empty.cxx) target_link_libraries(test_gtest2 GTest::Main) gtest_add_tests(TARGET test_gtest2 TEST_LIST testList - SOURCES main2.h + SOURCES main2.h empty.cxx ) set(expectedTests GoogleTest.SomethingElse diff --git a/Tests/GoogleTest/Test/empty.cxx b/Tests/GoogleTest/Test/empty.cxx new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/GoogleTest/Test/empty.cxx |