[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestBuildHandler.cxx 1.74 1.75

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv8400/Source/CTest

Modified Files:
	cmCTestBuildHandler.cxx 
Log Message:
Re-enabled failing tests; fixed ctest_build output to be consistent in the error condition across different make programs so that these tests would pass.


Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.74
retrieving revision 1.75
diff -C 2 -d -r1.74 -r1.75
*** cmCTestBuildHandler.cxx	11 Sep 2009 12:17:56 -0000	1.74
--- cmCTestBuildHandler.cxx	21 Sep 2009 17:40:40 -0000	1.75
***************
*** 446,454 ****
    this->EndBuildTime = cmSystemTools::GetTime();
    double elapsed_build_time = cmSystemTools::GetTime() - elapsed_time_start;
-   if (res != cmsysProcess_State_Exited || retVal )
-     {
-     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error(s) when building project"
-       << std::endl);
-     }
  
    // Cleanups strings in the errors and warnings list.
--- 446,449 ----
***************
*** 503,506 ****
--- 498,507 ----
    this->GenerateXMLFooter(xofs, elapsed_build_time);
  
+   if (res != cmsysProcess_State_Exited || retVal || this->TotalErrors > 0)
+     {
+     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error(s) when building project"
+       << std::endl);
+     }
+ 
    // Display message about number of errors and warnings
    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   " << this->TotalErrors