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:08 (GMT) |
| commit | a6732df9259f135d5ef08455868c49fdb1f0517c (patch) | |
| tree | 2b917ff2779fb39a5d9270a9b9379e8ccf7aaaa3 | |
| parent | dade4fc36c8ab7fe0ffdc673f714550af7a003e9 (diff) | |
| parent | 75aa3ee7e724e0f6c3d2707565519041efe1443f (diff) | |
| download | CMake-a6732df9259f135d5ef08455868c49fdb1f0517c.zip CMake-a6732df9259f135d5ef08455868c49fdb1f0517c.tar.gz CMake-a6732df9259f135d5ef08455868c49fdb1f0517c.tar.bz2 | |
Merge topic 'gtest-xml-output'
75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4942
| -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() |