diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-28 12:21:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-28 12:21:38 (GMT) |
| commit | 738f89f1ec0631b5282c375dd541af19084183ec (patch) | |
| tree | 694681d847931404a455cc43b6fa3e9cd111b812 | |
| parent | e4e899056eca97e62d40d47bf4ee2a4871553751 (diff) | |
| parent | c83919d19303af11f3bd24fe3306e0f9898032ef (diff) | |
| download | CMake-738f89f1ec0631b5282c375dd541af19084183ec.zip CMake-738f89f1ec0631b5282c375dd541af19084183ec.tar.gz CMake-738f89f1ec0631b5282c375dd541af19084183ec.tar.bz2 | |
Merge topic 'ctest-prefer-normative-text'
c83919d193 CTest: Prefer normative terms to express subprocess failures
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Lukas Riedel <mail@lukasriedel.com>
Acked-by: Yunus Sevinchan <yunussevinchan@gmail.com>
Merge-request: !5050
| -rw-r--r-- | Source/CTest/cmProcess.cxx | 6 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index a549117..9ee1c17 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -545,17 +545,17 @@ std::string cmProcess::GetExitExceptionString() # endif # ifdef SIGABRT case SIGABRT: - exception_str = "Child aborted"; + exception_str = "Subprocess aborted"; break; # endif # ifdef SIGKILL case SIGKILL: - exception_str = "Child killed"; + exception_str = "Subprocess killed"; break; # endif # ifdef SIGTERM case SIGTERM: - exception_str = "Child terminated"; + exception_str = "Subprocess terminated"; break; # endif # ifdef SIGHUP diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 19aa4c4..4a774dd 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2906,7 +2906,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH PASS_REGULAR_EXPRESSION "Failed") else() set_tests_properties(CTestTestCrash PROPERTIES - PASS_REGULAR_EXPRESSION "(Illegal|SegFault|Child aborted)") + PASS_REGULAR_EXPRESSION "(Illegal|SegFault|Subprocess aborted)") endif() configure_file( |