1 files changed, 9 insertions, 8 deletions
diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h
index 1084643..89456d5 100644
--- a/Source/CTest/cmCTestRunTest.h
+++ b/Source/CTest/cmCTestRunTest.h
@@ -39,6 +39,8 @@ public:
 
   std::string GetProcessOutput() { return this->ProcessOutput; }
 
+  bool IsStopTimePassed() { return this->StopTimePassed; }
+
   cmCTestTestHandler::cmCTestTestResult GetTestResults()
   { return this->TestResult; }
 
@@ -54,11 +56,15 @@ public:
   bool EndTest(size_t completed, size_t total, bool started);
   //Called by ctest -N to log the command string
   void ComputeArguments();
+
+  void ComputeWeightedCost();
 private:
   void DartProcessing();
   void ExeNotFound(std::string exe);
-  bool CreateProcess(double testTimeOut,
-                     std::vector<std::string>* environment);
+  // Figures out a final timeout which is min(STOP_TIME, NOW+TIMEOUT)
+  double ResolveTimeout();
+  bool ForkProcess(double testTimeOut, bool explicitTimeout,
+                   std::vector<std::string>* environment);
   void WriteLogOutputTop(size_t completed, size_t total);
   //Run post processing of the process output for MemCheck
   void MemCheckPostProcess();
@@ -73,14 +79,9 @@ private:
   //if this option is set to false.)
   //bool OptimizeForCTest;
 
-  //flag for whether the env was modified for this run
-  bool ModifyEnv;
-
   bool UsePrefixCommand;
   std::string PrefixCommand;
 
-  //stores the original environment if we are modifying it
-  std::vector<std::string> OrigEnv;
   std::string ProcessOutput;
   std::string CompressedOutput;
   double CompressionRatio;
@@ -88,9 +89,9 @@ private:
   cmCTestTestHandler::cmCTestTestResult TestResult;
   int Index;
   std::string StartTime;
-  std::string TestCommand;
   std::string ActualCommand;
   std::vector<std::string> Arguments;
+  bool StopTimePassed;
 };
 
 inline int getNumWidth(size_t n)