diff options
author | Ken Martin <ken.martin@kitware.com> | 2006-04-04 17:04:28 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2006-04-04 17:04:28 (GMT) |
commit | d81ebf0c23307162dfc5c4a3c978ad9360bee354 (patch) | |
tree | 615b1ec7ff9d411e5d9cffa5c90d3f40641fd446 /Source/CTest/cmCTestScriptHandler.h | |
parent | b45f4a5d450c4fd56fd564fe67be00c7aeb4b59a (diff) | |
download | CMake-d81ebf0c23307162dfc5c4a3c978ad9360bee354.zip CMake-d81ebf0c23307162dfc5c4a3c978ad9360bee354.tar.gz CMake-d81ebf0c23307162dfc5c4a3c978ad9360bee354.tar.bz2 |
ENH: added support for -SP scripts in new processes
Diffstat (limited to 'Source/CTest/cmCTestScriptHandler.h')
-rw-r--r-- | Source/CTest/cmCTestScriptHandler.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h index 344192b..e354005 100644 --- a/Source/CTest/cmCTestScriptHandler.h +++ b/Source/CTest/cmCTestScriptHandler.h @@ -69,9 +69,9 @@ public: cmTypeMacro(cmCTestScriptHandler, cmCTestGenericHandler); /** - * Add a script to run + * Add a script to run, and if is should run in the current process */ - void AddConfigurationScript(const char *); + void AddConfigurationScript(const char *, bool pscope); /** * Run a dashboard using a specified confiuration script @@ -81,7 +81,7 @@ public: /* * Run a script */ - static bool RunScript(cmCTest* ctest, const char *script); + static bool RunScript(cmCTest* ctest, const char *script, bool InProcess); int RunCurrentScript(); /* @@ -99,9 +99,11 @@ public: ~cmCTestScriptHandler(); void Initialize(); + private: // reads in a script int ReadInScript(const std::string& total_script_arg); + int ExecuteScript(const std::string& total_script_arg); // extract vars from the script to set ivars int ExtractVariables(); @@ -116,13 +118,14 @@ private: int BackupDirectories(); void RestoreBackupDirectories(); - int RunConfigurationScript(const std::string& script); + int RunConfigurationScript(const std::string& script, bool pscope); int RunConfigurationDashboard(); // Add ctest command void AddCTestCommand(cmCTestCommand* command); std::vector<cmStdString> ConfigurationScripts; + std::vector<bool> ScriptProcessScope; bool Backup; bool EmptyBinDir; |