maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[lldb/API] Overwrite variables with SBLaunchInfo::SetEnvironment(append=true)" 

This reverts commit 695b33a569 beacuse
it broke the macOS bot.
This commit is contained in:
Davide Italiano 2020-07-08 13:00:29 -07:00
parent 4544c2d95a
commit 27d52cd86a
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lldb/source/API/SBLaunchInfo.cpp
View File

@ -190,10 +190,9 @@ void SBLaunchInfo::SetEnvironment(const SBEnvironment &env, bool append) {
LLDB_RECORD_METHOD(void, SBLaunchInfo, SetEnvironment,
(const lldb::SBEnvironment &, bool), env, append);
Environment &refEnv = env.ref();
if (append) {
for (auto &KV : refEnv)
m_opaque_sp->GetEnvironment().insert_or_assign(KV.first(), KV.second);
} else
if (append)
m_opaque_sp->GetEnvironment().insert(refEnv.begin(), refEnv.end());
else
m_opaque_sp->GetEnvironment() = refEnv;
m_opaque_sp->RegenerateEnvp();
}

10
lldb/test/API/python_api/sbenvironment/TestSBEnvironment.py
View File

@ -53,11 +53,6 @@ class SBEnvironmentAPICase(TestBase):
launch_info.SetEnvironment(env, append=True)
self.assertEqual(launch_info.GetEnvironment().GetNumValues(), env_count + 1)
env.Set("FOO", "baz", overwrite=True)
launch_info.SetEnvironment(env, append=True)
self.assertEqual(launch_info.GetEnvironment().GetNumValues(), env_count + 1)
self.assertEqual(launch_info.GetEnvironment().Get("FOO"), "baz")
# Make sure we can replace the launchInfo's environment
env.Clear()
env.Set("BAR", "foo", overwrite=True)
@ -125,11 +120,6 @@ class SBEnvironmentAPICase(TestBase):
env.SetEntries(entries, append=False)
self.assertEqualEntries(env, ["X=x", "Y=y"])
entries.Clear()
entries.AppendList(["X=y", "Y=x"], 2)
env.SetEntries(entries, append=True)
self.assertEqualEntries(env, ["X=y", "Y=x"])
# Test clear
env.Clear()
self.assertEqualEntries(env, [])