[Cmake-commits] [cmake-commits] hoffman committed cmCTestBuildHandler.cxx 1.66 1.67 cmProcess.cxx 1.5 1.6
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jan 14 13:48:05 EST 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv30959/Source/CTest
Modified Files:
cmCTestBuildHandler.cxx cmProcess.cxx
Log Message:
ENH: fix return value to ctest_build and remove debug print in cmProcess
Index: cmProcess.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmProcess.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmProcess.cxx 14 Jan 2009 18:01:38 -0000 1.5
--- cmProcess.cxx 14 Jan 2009 18:48:03 -0000 1.6
***************
*** 214,218 ****
this->ExitValue = cmsysProcess_GetExitValue(this->Process);
this->TotalTime = cmSystemTools::GetTime() - this->StartTime;
! std::cerr << "Time to run: " << this->TotalTime << "\n";
return false;
}
--- 214,218 ----
this->ExitValue = cmsysProcess_GetExitValue(this->Process);
this->TotalTime = cmSystemTools::GetTime() - this->StartTime;
! // std::cerr << "Time to run: " << this->TotalTime << "\n";
return false;
}
Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.66
retrieving revision 1.67
diff -C 2 -d -r1.66 -r1.67
*** cmCTestBuildHandler.cxx 14 Jan 2009 18:01:38 -0000 1.66
--- cmCTestBuildHandler.cxx 14 Jan 2009 18:48:03 -0000 1.67
***************
*** 476,480 ****
this->GenerateDartBuildOutput(
xofs, this->ErrorsAndWarnings, elapsed_build_time);
! return res;
}
--- 476,480 ----
this->GenerateDartBuildOutput(
xofs, this->ErrorsAndWarnings, elapsed_build_time);
! return retVal;
}
***************
*** 725,729 ****
this->ErrorsAndWarnings.push_back(errorwarning);
this->TotalWarnings ++;
- return *retVal; // return the program return value
}
}
--- 725,728 ----
***************
*** 736,740 ****
cmCTestLog(this->CTest, WARNING, "There was an exception: " << *retVal
<< std::endl);
- return *retVal;
}
}
--- 735,738 ----
***************
*** 742,746 ****
{
cmCTestLog(this->CTest, WARNING, "There was a timeout" << std::endl);
- return -1;
}
else if(result == cmsysProcess_State_Error)
--- 740,743 ----
***************
*** 758,767 ****
cmCTestLog(this->CTest, ERROR_MESSAGE, "There was an error: "
<< cmsysProcess_GetErrorString(cp) << std::endl);
- return -1;
}
cmsysProcess_Delete(cp);
!
! return 0;
}
--- 755,762 ----
cmCTestLog(this->CTest, ERROR_MESSAGE, "There was an error: "
<< cmsysProcess_GetErrorString(cp) << std::endl);
}
cmsysProcess_Delete(cp);
! return result;
}
More information about the Cmake-commits
mailing list