diff options
author | Brad King <brad.king@kitware.com> | 2021-12-20 14:23:33 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-20 14:23:44 (GMT) |
commit | e3ece528c8718d67560bcc5bab579e77bbf21cbd (patch) | |
tree | 5919f02c00b7b80a91badfaf9fff62074580aa0c /Modules | |
parent | 6db5fdae4db24a3c421769f24f977a4d10f40212 (diff) | |
parent | 0f51987d42f5b7842d3ab95e9801bc3e4f32c951 (diff) | |
download | CMake-e3ece528c8718d67560bcc5bab579e77bbf21cbd.zip CMake-e3ece528c8718d67560bcc5bab579e77bbf21cbd.tar.gz CMake-e3ece528c8718d67560bcc5bab579e77bbf21cbd.tar.bz2 |
Merge topic 'googletest-executor-error'
0f51987d42 GoogleTest: show test executor in error message
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6813
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/GoogleTestAddTests.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/GoogleTestAddTests.cmake b/Modules/GoogleTestAddTests.cmake index 6b3bf34..dffbc46 100644 --- a/Modules/GoogleTestAddTests.cmake +++ b/Modules/GoogleTestAddTests.cmake @@ -80,9 +80,14 @@ function(gtest_discover_tests_impl) ) if(NOT ${result} EQUAL 0) string(REPLACE "\n" "\n " output "${output}") + if(_TEST_EXECUTOR) + set(path "${_TEST_EXECUTOR} ${_TEST_EXECUTABLE}") + else() + set(path "${_TEST_EXECUTABLE}") + endif() message(FATAL_ERROR "Error running test executable.\n" - " Path: '${_TEST_EXECUTABLE}'\n" + " Path: '${path}'\n" " Result: ${result}\n" " Output:\n" " ${output}\n" |