diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-19 13:10:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-19 13:10:55 (GMT) |
| commit | c3b4453b13b853268ba875cda5e3f3d10830f1a4 (patch) | |
| tree | 75c1c89c77a4c30ff4947b3f072f62ac126794f2 | |
| parent | d2cbadf3b435af9d271b5ed174c56c16af771f79 (diff) | |
| parent | 2ea216a6bb46c8421677fd34ba6d1cc2999063be (diff) | |
| download | CMake-c3b4453b13b853268ba875cda5e3f3d10830f1a4.zip CMake-c3b4453b13b853268ba875cda5e3f3d10830f1a4.tar.gz CMake-c3b4453b13b853268ba875cda5e3f3d10830f1a4.tar.bz2 | |
Merge topic 'gtest_discover_tests_error_message'
2ea216a6bb GoogleTest: Add working directory to gtest_discover_tests error message
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9083
3 files changed, 3 insertions, 0 deletions
diff --git a/Modules/GoogleTestAddTests.cmake b/Modules/GoogleTestAddTests.cmake index de0f7d6..eea267d 100644 --- a/Modules/GoogleTestAddTests.cmake +++ b/Modules/GoogleTestAddTests.cmake @@ -112,6 +112,7 @@ function(gtest_discover_tests_impl) message(FATAL_ERROR "Error running test executable.\n" " Path: '${path}'\n" + " Working directory: '${_TEST_WORKING_DIR}'\n" " Result: ${result}\n" " Output:\n" " ${output}\n" diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-discovery-POST_BUILD-timeout-build-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-discovery-POST_BUILD-timeout-build-stdout.txt index 3a6572c..84bbe9f 100644 --- a/Tests/RunCMake/GoogleTest/GoogleTest-discovery-POST_BUILD-timeout-build-stdout.txt +++ b/Tests/RunCMake/GoogleTest/GoogleTest-discovery-POST_BUILD-timeout-build-stdout.txt @@ -2,6 +2,7 @@ ( *|[0-9]+>) Error running test executable. ?( *|[0-9]+>) ( *|[0-9]+>) Path: '.*discovery_timeout_test(\.exe)?' +( *|[0-9]+>) Working directory: '[^']*/Tests/RunCMake/GoogleTest/GoogleTest-discovery-timeout' ( *|[0-9]+>) Result: Process terminated due to timeout ( *|[0-9]+>) Output: ( *|[0-9]+>) + diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-discovery-PRE_TEST-timeout-test-stderr.txt b/Tests/RunCMake/GoogleTest/GoogleTest-discovery-PRE_TEST-timeout-test-stderr.txt index 75afe4a..03d73ee 100644 --- a/Tests/RunCMake/GoogleTest/GoogleTest-discovery-PRE_TEST-timeout-test-stderr.txt +++ b/Tests/RunCMake/GoogleTest/GoogleTest-discovery-PRE_TEST-timeout-test-stderr.txt @@ -2,6 +2,7 @@ CMake Error at .*GoogleTestAddTests.cmake:[0-9]+ \(message\): [ \t]*Error running test executable. + [ \t]*Path: '.*discovery_timeout_test(\.exe)?' +[ \t]*Working directory: '[^']*/Tests/RunCMake/GoogleTest/GoogleTest-discovery-timeout' [ \t]*Result: Process terminated due to timeout [ \t]*Output: [ \t]*timeout. |