[Cmake-commits] CMake branch, next, updated. v2.8.1-1458-g57aa177

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  57aa17786387a71d39a6139a0efee3e7ec1a13ea (commit)
       via  8f8c1edca2f577e2fc0507186c033cdfd2b28d4f (commit)
      from  dcfff5821e390660aa8f5828483af7eca5117a52 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57aa17786387a71d39a6139a0efee3e7ec1a13ea
commit 57aa17786387a71d39a6139a0efee3e7ec1a13ea
Merge: dcfff58 8f8c1ed
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Tue Jun 22 09:57:23 2010 -0400

    Merge branch 'fix_ctest_failure_code' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f8c1edca2f577e2fc0507186c033cdfd2b28d4f
commit 8f8c1edca2f577e2fc0507186c033cdfd2b28d4f
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Tue Jun 22 09:55:09 2010 -0400

    Fix for bug #10859, ctest exit exception incorrectly reported.
    
    CTest was using the return value from the program instead of the
    exit exception value for the process.

diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 4c9675b..bd644c6 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -220,7 +220,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:

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx |    2 +-
 Source/CTest/cmProcess.cxx      |    6 ++++++
 Source/CTest/cmProcess.h        |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake