dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-06 07:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ctest-prefer-normative-text'

Browse Source 
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
This commit is contained in:
Brad King
2020-07-28 12:21:18 +00:00
committed by Kitware Robot
parent e4e899056e c83919d193
commit 738f89f1ec
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CTest/cmProcess.cxx
View File

@@ -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

2
Tests/CMakeLists.txt
View File

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