mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmProcess: Use explicit enum for process exit exception

Browse Source 
Translate the values from KWSys Process.
This commit is contained in:
Bryon Bean
2017-10-23 08:16:45 -04:00
committed by Brad King
parent 3dd2edf4ab
commit fcebff75f9
3 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CTest/cmCTestRunTest.cxx
View File

@@ -225,19 +225,19 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
this->TestResult.ExceptionStatus =
this->TestProcess->GetExitExceptionString();
switch (this->TestProcess->GetExitException()) {
case cmsysProcess_Exception_Fault:
case cmProcess::Exception::Fault:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "SegFault");
this->TestResult.Status = cmCTestTestHandler::SEGFAULT;
break;
case cmsysProcess_Exception_Illegal:
case cmProcess::Exception::Illegal:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Illegal");
this->TestResult.Status = cmCTestTestHandler::ILLEGAL;
break;
case cmsysProcess_Exception_Interrupt:
case cmProcess::Exception::Interrupt:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Interrupt");
this->TestResult.Status = cmCTestTestHandler::INTERRUPT;
break;
case cmsysProcess_Exception_Numerical:
case cmProcess::Exception::Numerical:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "Numerical");
this->TestResult.Status = cmCTestTestHandler::NUMERICAL;
break;

18
Source/CTest/cmProcess.cxx
View File

@@ -193,9 +193,23 @@ void cmProcess::ResetStartTime()
this->StartTime = std::chrono::steady_clock::now();
}
int cmProcess::GetExitException()
cmProcess::Exception cmProcess::GetExitException()
{
return cmsysProcess_GetExitException(this->Process);
switch (cmsysProcess_GetExitException(this->Process)) {
case cmsysProcess_Exception_None:
return Exception::None;
case cmsysProcess_Exception_Fault:
return Exception::Fault;
case cmsysProcess_Exception_Illegal:
return Exception::Illegal;
case cmsysProcess_Exception_Interrupt:
return Exception::Interrupt;
case cmsysProcess_Exception_Numerical:
return Exception::Numerical;
default: // case cmsysProcess_Exception_Other:
break;
}
return Exception::Other;
}
std::string cmProcess::GetExitExceptionString()

14
Source/CTest/cmProcess.h
View File

@@ -47,8 +47,20 @@ public:
void SetId(int id) { this->Id = id; }
int GetExitValue() { return this->ExitValue; }
std::chrono::duration<double> GetTotalTime() { return this->TotalTime; }
int GetExitException();
enum class Exception
{
None,
Fault,
Illegal,
Interrupt,
Numerical,
Other
};
Exception GetExitException();
std::string GetExitExceptionString();
/**
* Read one line of output but block for no more than timeout.
* Returns: