diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-29 12:21:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-29 12:21:07 (GMT) |
| commit | 4c28bf2acacec2de4db1465d330a410d771134d5 (patch) | |
| tree | cc05a94b74fad384b5a2e063b271272e5be3642d /Modules | |
| parent | df8ba4f10dd53698923dc6435f4d7575a1588dd4 (diff) | |
| parent | 75aa3ee7e724e0f6c3d2707565519041efe1443f (diff) | |
| download | CMake-4c28bf2acacec2de4db1465d330a410d771134d5.zip CMake-4c28bf2acacec2de4db1465d330a410d771134d5.tar.gz CMake-4c28bf2acacec2de4db1465d330a410d771134d5.tar.bz2 | |
Merge topic 'gtest-xml-output' into release-3.18
75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4942
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GoogleTestAddTests.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/GoogleTestAddTests.cmake b/Modules/GoogleTestAddTests.cmake index 4af62ed..5d098d9 100644 --- a/Modules/GoogleTestAddTests.cmake +++ b/Modules/GoogleTestAddTests.cmake @@ -112,7 +112,7 @@ function(gtest_discover_tests_impl) string(REGEX REPLACE "^DISABLED_" "" pretty_test "${pretty_test}") string(REGEX REPLACE "#.*" "" test "${test}") if(NOT "${_TEST_XML_OUTPUT_DIR}" STREQUAL "") - set(TEST_XML_OUTPUT_PARAM "--gtest_output=xml:${_TEST_XML_OUTPUT_DIR}/${prefix}${pretty_suite}.${pretty_test}${suffix}.xml") + set(TEST_XML_OUTPUT_PARAM "--gtest_output=xml:${_TEST_XML_OUTPUT_DIR}/${prefix}${suite}.${test}${suffix}.xml") else() unset(TEST_XML_OUTPUT_PARAM) endif() |