Skip to content

Commit 27d52cd

Browse files
author
Davide Italiano
committed
Revert "[lldb/API] Overwrite variables with SBLaunchInfo::SetEnvironment(append=true)"
This reverts commit 695b33a beacuse it broke the macOS bot.
1 parent 4544c2d commit 27d52cd

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

lldb/source/API/SBLaunchInfo.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,9 @@ void SBLaunchInfo::SetEnvironment(const SBEnvironment &env, bool append) {
190190
LLDB_RECORD_METHOD(void, SBLaunchInfo, SetEnvironment,
191191
(const lldb::SBEnvironment &, bool), env, append);
192192
Environment &refEnv = env.ref();
193-
if (append) {
194-
for (auto &KV : refEnv)
195-
m_opaque_sp->GetEnvironment().insert_or_assign(KV.first(), KV.second);
196-
} else
193+
if (append)
194+
m_opaque_sp->GetEnvironment().insert(refEnv.begin(), refEnv.end());
195+
else
197196
m_opaque_sp->GetEnvironment() = refEnv;
198197
m_opaque_sp->RegenerateEnvp();
199198
}

lldb/test/API/python_api/sbenvironment/TestSBEnvironment.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ def test_launch_info(self):
5353
launch_info.SetEnvironment(env, append=True)
5454
self.assertEqual(launch_info.GetEnvironment().GetNumValues(), env_count + 1)
5555

56-
env.Set("FOO", "baz", overwrite=True)
57-
launch_info.SetEnvironment(env, append=True)
58-
self.assertEqual(launch_info.GetEnvironment().GetNumValues(), env_count + 1)
59-
self.assertEqual(launch_info.GetEnvironment().Get("FOO"), "baz")
60-
6156
# Make sure we can replace the launchInfo's environment
6257
env.Clear()
6358
env.Set("BAR", "foo", overwrite=True)
@@ -125,11 +120,6 @@ def test_creating_and_modifying_environment(self):
125120
env.SetEntries(entries, append=False)
126121
self.assertEqualEntries(env, ["X=x", "Y=y"])
127122

128-
entries.Clear()
129-
entries.AppendList(["X=y", "Y=x"], 2)
130-
env.SetEntries(entries, append=True)
131-
self.assertEqualEntries(env, ["X=y", "Y=x"])
132-
133123
# Test clear
134124
env.Clear()
135125
self.assertEqualEntries(env, [])

0 commit comments

Comments
 (0)