diff options
| author | Brad King <brad.king@kitware.com> | 2010-06-24 14:35:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-06-24 14:35:10 (GMT) |
| commit | 73144a8f1c9cf31f79ac852aa75e1c75819c6062 (patch) | |
| tree | e5ca30d6fee5f77cc6c1590fd37b33abc4262bc7 /Source/CTest | |
| parent | 0d400c373e2f9a6a4a4c07dffbcb91d501e0bb9b (diff) | |
| parent | 8f8c1edca2f577e2fc0507186c033cdfd2b28d4f (diff) | |
| download | CMake-73144a8f1c9cf31f79ac852aa75e1c75819c6062.zip CMake-73144a8f1c9cf31f79ac852aa75e1c75819c6062.tar.gz CMake-73144a8f1c9cf31f79ac852aa75e1c75819c6062.tar.bz2 | |
Merge branch 'fix_ctest_failure_code'
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 2 | ||||
| -rw-r--r-- | Source/CTest/cmProcess.cxx | 6 | ||||
| -rw-r--r-- | Source/CTest/cmProcess.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 9fb8827..3719d45 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -221,7 +221,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started) { outputTestErrorsToConsole = this->CTest->OutputTestOutputOnTestFailure; cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Exception: "); - switch ( retVal ) + switch(this->TestProcess->GetExitException()) { case cmsysProcess_Exception_Fault: cmCTestLog(this->CTest, HANDLER_OUTPUT, "SegFault"); diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index 9aa40d6..0ee631f 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -264,3 +264,9 @@ int cmProcess::ReportStatus() return result; } + + +int cmProcess::GetExitException() +{ + return cmsysProcess_GetExitException(this->Process); +} diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h index 01dacf9..ff99ca2 100644 --- a/Source/CTest/cmProcess.h +++ b/Source/CTest/cmProcess.h @@ -43,7 +43,7 @@ public: void SetId(int id) { this->Id = id;} int GetExitValue() { return this->ExitValue;} double GetTotalTime() { return this->TotalTime;} - + int GetExitException(); /** * Read one line of output but block for no more than timeout. * Returns: |