summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmProcess.h
diff options
context:
space:
mode:
authorZach Mullen <zach.mullen@kitware.com>2009-09-04 17:50:06 (GMT)
committerZach Mullen <zach.mullen@kitware.com>2009-09-04 17:50:06 (GMT)
commit5517e17bf936ad243536e793dc792f4dfccf2497 (patch)
tree8b1a924324656d3bfa0151d64b71c1c3ac6c3d9f /Source/CTest/cmProcess.h
parent7d190a65ca3fb717e4889de7604ac8ef3484c593 (diff)
downloadCMake-5517e17bf936ad243536e793dc792f4dfccf2497.zip
CMake-5517e17bf936ad243536e793dc792f4dfccf2497.tar.gz
CMake-5517e17bf936ad243536e793dc792f4dfccf2497.tar.bz2
Fixed ctest output processing. Should now display output as it occurs, as well as be able to consume multiple lines if they exist within the timeout.
Diffstat (limited to 'Source/CTest/cmProcess.h')
-rw-r--r--Source/CTest/cmProcess.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h
index 9def390..2d11e61 100644
--- a/Source/CTest/cmProcess.h
+++ b/Source/CTest/cmProcess.h
@@ -41,7 +41,7 @@ public:
bool StartProcess();
// return process state
- int CheckOutput(double timeout);
+ void CheckOutput(double timeout);
// return the process status
int GetProcessStatus();
// return true if the process is running
@@ -52,7 +52,8 @@ public:
void SetId(int id) { this->Id = id;}
int GetExitValue() { return this->ExitValue;}
double GetTotalTime() { return this->TotalTime;}
- bool GetNextOutputLine(std::string& stdOutLine, std::string& stdErrLine);
+ int GetNextOutputLine(std::string& stdOutLine, std::string& stdErrLine,
+ bool& gotStdOut, bool& gotStdErr);
private:
int LastOutputPipe;
double Timeout;