summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmProcess.h
diff options
context:
space:
mode:
authorZach Mullen <zach.mullen@kitware.com>2009-09-08 14:16:16 (GMT)
committerZach Mullen <zach.mullen@kitware.com>2009-09-08 14:16:16 (GMT)
commita02ef564018be7e383992d52399279ea7cf48c91 (patch)
tree72261a3b4befbf6a644c3c3216f83420a9c634ba /Source/CTest/cmProcess.h
parent384f4d1f3f14e57a56a43b4f99233c9210041846 (diff)
downloadCMake-a02ef564018be7e383992d52399279ea7cf48c91.zip
CMake-a02ef564018be7e383992d52399279ea7cf48c91.tar.gz
CMake-a02ef564018be7e383992d52399279ea7cf48c91.tar.bz2
BUG: Fixed issue where ctest would hang if a process terminated with output in its buffers but no newline
Diffstat (limited to 'Source/CTest/cmProcess.h')
-rw-r--r--Source/CTest/cmProcess.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h
index 2d11e61..08ce733 100644
--- a/Source/CTest/cmProcess.h
+++ b/Source/CTest/cmProcess.h
@@ -40,8 +40,8 @@ public:
// Return true if the process starts
bool StartProcess();
- // return process state
- void CheckOutput(double timeout);
+ // return false if process has exited, true otherwise
+ bool CheckOutput(double timeout);
// return the process status
int GetProcessStatus();
// return true if the process is running
@@ -53,7 +53,7 @@ public:
int GetExitValue() { return this->ExitValue;}
double GetTotalTime() { return this->TotalTime;}
int GetNextOutputLine(std::string& stdOutLine, std::string& stdErrLine,
- bool& gotStdOut, bool& gotStdErr);
+ bool& gotStdOut, bool& gotStdErr, bool running);
private:
int LastOutputPipe;
double Timeout;