瀏覽代碼

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

Bill Hoffman 17 年之前
父節點
當前提交
046449e2f7
共有 2 個文件被更改,包括 3 次插入8 次删除
  1. 2 7
      Source/CTest/cmCTestBuildHandler.cxx
  2. 1 1
      Source/CTest/cmProcess.cxx

+ 2 - 7
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;
 }
 
 //######################################################################

+ 1 - 1
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;
 }