diff options
author | Robert Maynard <robert.maynard@kitware.com> | 2020-07-23 12:59:41 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-07-27 14:32:21 (GMT) |
commit | c83919d19303af11f3bd24fe3306e0f9898032ef (patch) | |
tree | 1225569fe03069eee501d959286431a12fd2b61b | |
parent | c7b7547d8da6b9a4225d111440d0cf6c2f55914d (diff) | |
download | CMake-c83919d19303af11f3bd24fe3306e0f9898032ef.zip CMake-c83919d19303af11f3bd24fe3306e0f9898032ef.tar.gz CMake-c83919d19303af11f3bd24fe3306e0f9898032ef.tar.bz2 |
CTest: Prefer normative terms to express subprocess failures
Issue: #21004
-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( |