summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2009-12-23 19:34:46 (GMT)
committerDavid Cole <david.cole@kitware.com>2009-12-23 19:34:46 (GMT)
commit4d3a387ac6cca006ca3b35c67f562fa15702fa4c (patch)
treef7d0f06bf126cc88243847f982c37cfd9eb68a5b /Source/CTest
parent68ed752b7db18013641683c139c3aa0671f2d757 (diff)
downloadCMake-4d3a387ac6cca006ca3b35c67f562fa15702fa4c.zip
CMake-4d3a387ac6cca006ca3b35c67f562fa15702fa4c.tar.gz
CMake-4d3a387ac6cca006ca3b35c67f562fa15702fa4c.tar.bz2
Preserve environment variables across calls to cmCTestScriptHandler::RunConfigurationScript. This will help prevent problems like we are currently experiencing (regarding CMake continuous dashboards only running once each day because the HOME environment variable is modified indirectly by a command in a called script, but affects the environment in the calling script).
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestScriptHandler.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 5983e68..fdf17e0 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -583,6 +583,10 @@ void cmCTestScriptHandler::SleepInSeconds(unsigned int secondsToWait)
int cmCTestScriptHandler::RunConfigurationScript
(const std::string& total_script_arg, bool pscope)
{
+#ifdef CMAKE_BUILD_WITH_CMAKE
+ cmSystemTools::SaveRestoreEnvironment sre;
+#endif
+
int result;
this->ScriptStartTime =