Merge topic 'envmod-support-mod-to-new-variables'

69f95cf1d9 cmCTestRunTest: fix modifying non-existent envvars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6663

1 files changed, 2 insertions, 6 deletions

diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 20f0ed3..2d1562a 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -800,13 +800,9 @@ bool cmCTestRunTest::ForkProcess(
     auto apply_diff =
       [&env_application](const std::string& name,
                          std::function<void(std::string&)> const& apply) {
-        auto entry = env_application.find(name);
-        std::string output;
-        if (entry != env_application.end() && entry->second) {
-          output = *entry->second;
-        }
+        std::string output = env_application[name].value_or(std::string{});
         apply(output);
-        entry->second = output;
+        env_application[name] = output;
       };
 
     bool err_occurred = false;