Merge topic 'gtest-xml-output'

75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR

Acked-by: Kitware Robot <[email protected]>
Merge-request: !4942

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()