summaryrefslogtreecommitdiffstats
path: root/Source/cmCTest.h
diff options
context:
space:
mode:
authorDāvis Mosāns <davispuh@gmail.com>2016-11-01 18:36:58 (GMT)
committerDāvis Mosāns <davispuh@gmail.com>2016-11-14 23:00:46 (GMT)
commit40bd42dfbcafd572ccd3541f1f84177453c9c255 (patch)
treed6f0528a9320341c2163930a586bb4404501faed /Source/cmCTest.h
parent595feb323479ce6e8f8e8a3a863f9286d9f7bd64 (diff)
downloadCMake-40bd42dfbcafd572ccd3541f1f84177453c9c255.zip
CMake-40bd42dfbcafd572ccd3541f1f84177453c9c255.tar.gz
CMake-40bd42dfbcafd572ccd3541f1f84177453c9c255.tar.bz2
Add Encoding option for RunChild, RunMakeCommand and RunProcess
Diffstat (limited to 'Source/cmCTest.h')
-rw-r--r--Source/cmCTest.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index e5b4728..4436327 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -5,6 +5,7 @@
#include <cmConfigure.h>
+#include <cmProcessOutput.h>
#include <cmsys/String.hxx>
#include <map>
#include <set>
@@ -48,6 +49,7 @@ class cmCTest
friend class cmCTestMultiProcessHandler;
public:
+ typedef cmProcessOutput::Encoding Encoding;
/** Enumerate parts of the testing and submission process. */
enum Part
{
@@ -267,7 +269,8 @@ public:
*/
bool RunCommand(const char* command, std::string* stdOut,
std::string* stdErr, int* retVal = CM_NULLPTR,
- const char* dir = CM_NULLPTR, double timeout = 0.0);
+ const char* dir = CM_NULLPTR, double timeout = 0.0,
+ Encoding encoding = cmProcessOutput::Auto);
/**
* Clean/make safe for xml the given value such that it may be used as
@@ -286,7 +289,8 @@ public:
* and retVal is return value or exception.
*/
int RunMakeCommand(const char* command, std::string& output, int* retVal,
- const char* dir, int timeout, std::ostream& ofs);
+ const char* dir, int timeout, std::ostream& ofs,
+ Encoding encoding = cmProcessOutput::Auto);
/** Return the current tag */
std::string GetCurrentTag();
@@ -333,7 +337,8 @@ public:
*/
int RunTest(std::vector<const char*> args, std::string* output, int* retVal,
std::ostream* logfile, double testTimeOut,
- std::vector<std::string>* environment);
+ std::vector<std::string>* environment,
+ Encoding encoding = cmProcessOutput::Auto);
/**
* Execute handler and return its result. If the handler fails, it returns