summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2009-01-14 18:48:03 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2009-01-14 18:48:03 (GMT)
commit046449e2f71e22a2cf46b9774665250ffa9da27c (patch)
tree5880475fb93859892a1c60287c05b72d1decebef /Source/CTest
parent82c3afcf6f78833e55bc6140799b5809a4527f03 (diff)
downloadCMake-046449e2f71e22a2cf46b9774665250ffa9da27c.zip
CMake-046449e2f71e22a2cf46b9774665250ffa9da27c.tar.gz
CMake-046449e2f71e22a2cf46b9774665250ffa9da27c.tar.bz2
ENH: fix return value to ctest_build and remove debug print in cmProcess
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestBuildHandler.cxx9
-rw-r--r--Source/CTest/cmProcess.cxx2
2 files changed, 3 insertions, 8 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index a730981..ab19b7b 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -475,7 +475,7 @@ int cmCTestBuildHandler::ProcessHandler()
}
this->GenerateDartBuildOutput(
xofs, this->ErrorsAndWarnings, elapsed_build_time);
- return res;
+ return retVal;
}
//----------------------------------------------------------------------
@@ -724,7 +724,6 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
errorwarning.Error = false;
this->ErrorsAndWarnings.push_back(errorwarning);
this->TotalWarnings ++;
- return *retVal; // return the program return value
}
}
}
@@ -735,13 +734,11 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
*retVal = cmsysProcess_GetExitException(cp);
cmCTestLog(this->CTest, WARNING, "There was an exception: " << *retVal
<< std::endl);
- return *retVal;
}
}
else if(result == cmsysProcess_State_Expired)
{
cmCTestLog(this->CTest, WARNING, "There was a timeout" << std::endl);
- return -1;
}
else if(result == cmsysProcess_State_Error)
{
@@ -757,12 +754,10 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
this->TotalErrors ++;
cmCTestLog(this->CTest, ERROR_MESSAGE, "There was an error: "
<< cmsysProcess_GetErrorString(cp) << std::endl);
- return -1;
}
cmsysProcess_Delete(cp);
-
- return 0;
+ return result;
}
//######################################################################
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx
index 37c6a17..75db654 100644
--- a/Source/CTest/cmProcess.cxx
+++ b/Source/CTest/cmProcess.cxx
@@ -213,7 +213,7 @@ bool cmProcess::IsRunning()
cmsysProcess_WaitForExit(this->Process, 0);
this->ExitValue = cmsysProcess_GetExitValue(this->Process);
this->TotalTime = cmSystemTools::GetTime() - this->StartTime;
- std::cerr << "Time to run: " << this->TotalTime << "\n";
+// std::cerr << "Time to run: " << this->TotalTime << "\n";
return false;
}