diff options
| author | David Cole <david.cole@kitware.com> | 2012-05-01 18:09:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-05-01 18:09:12 (GMT) |
| commit | c75f404065590d029d91779e4b113340303559f9 (patch) | |
| tree | 42bddaa9cfc573f038bf7a4a0d5639f5e31ca36a /Source/CTest/cmCTestScriptHandler.cxx | |
| parent | 203be17fd0d519f3f782d29a900d398528fcce6d (diff) | |
| parent | e48796b26b5b2b75401b48d21927b1d2912d4dca (diff) | |
| download | CMake-c75f404065590d029d91779e4b113340303559f9.zip CMake-c75f404065590d029d91779e4b113340303559f9.tar.gz CMake-c75f404065590d029d91779e4b113340303559f9.tar.bz2 | |
Merge topic 'kwsys-environ-cleanup'
e48796b KWSys: Fix SystemTools environment memory handling (#13156)
b10c5cb CTest: Simplify environment save/restore
Diffstat (limited to 'Source/CTest/cmCTestScriptHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 5841b8d..d3ab2ef 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -643,11 +643,7 @@ int cmCTestScriptHandler::RunCurrentScript() { std::vector<std::string> envArgs; cmSystemTools::ExpandListArgument(this->CTestEnv.c_str(),envArgs); - // for each variable/argument do a putenv - for (unsigned i = 0; i < envArgs.size(); ++i) - { - cmSystemTools::PutEnv(envArgs[i].c_str()); - } + cmSystemTools::AppendEnv(envArgs); } // now that we have done most of the error checking finally run the |