kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix return value to ctest_build and remove debug print in cmProcess

Browse Source
This commit is contained in:
Bill Hoffman 2009-01-14 13:48:03 -05:00
parent 82c3afcf6f
commit 046449e2f7
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/CTest/cmCTestBuildHandler.cxx
View File

@ -475,7 +475,7 @@ int cmCTestBuildHandler::ProcessHandler()
} }
this->GenerateDartBuildOutput( this->GenerateDartBuildOutput(
xofs, this->ErrorsAndWarnings, elapsed_build_time); xofs, this->ErrorsAndWarnings, elapsed_build_time);
return res; return retVal;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -724,7 +724,6 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
errorwarning.Error = false; errorwarning.Error = false;
this->ErrorsAndWarnings.push_back(errorwarning); this->ErrorsAndWarnings.push_back(errorwarning);
this->TotalWarnings ++; this->TotalWarnings ++;
return *retVal; // return the program return value
} }
} }
} }
@ -735,13 +734,11 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
*retVal = cmsysProcess_GetExitException(cp); *retVal = cmsysProcess_GetExitException(cp);
cmCTestLog(this->CTest, WARNING, "There was an exception: " << *retVal cmCTestLog(this->CTest, WARNING, "There was an exception: " << *retVal
<< std::endl); << std::endl);
return *retVal;
} }
} }
else if(result == cmsysProcess_State_Expired) else if(result == cmsysProcess_State_Expired)
{ {
cmCTestLog(this->CTest, WARNING, "There was a timeout" << std::endl); cmCTestLog(this->CTest, WARNING, "There was a timeout" << std::endl);
return -1;
} }
else if(result == cmsysProcess_State_Error) else if(result == cmsysProcess_State_Error)
{ {
@ -757,12 +754,10 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
this->TotalErrors ++; this->TotalErrors ++;
cmCTestLog(this->CTest, ERROR_MESSAGE, "There was an error: " cmCTestLog(this->CTest, ERROR_MESSAGE, "There was an error: "
<< cmsysProcess_GetErrorString(cp) << std::endl); << cmsysProcess_GetErrorString(cp) << std::endl);
return -1;
} }
cmsysProcess_Delete(cp); cmsysProcess_Delete(cp);
return result;
return 0;
} }
//###################################################################### //######################################################################

2
Source/CTest/cmProcess.cxx
View File

@ -213,7 +213,7 @@ bool cmProcess::IsRunning()
cmsysProcess_WaitForExit(this->Process, 0); cmsysProcess_WaitForExit(this->Process, 0);
this->ExitValue = cmsysProcess_GetExitValue(this->Process); this->ExitValue = cmsysProcess_GetExitValue(this->Process);
this->TotalTime = cmSystemTools::GetTime() - this->StartTime; this->TotalTime = cmSystemTools::GetTime() - this->StartTime;
std::cerr << "Time to run: " << this->TotalTime << "\n"; // std::cerr << "Time to run: " << this->TotalTime << "\n";
return false; return false;
} }