diff options
| -rw-r--r-- | lldb/lit/Process/Inputs/env.cpp | 7 | ||||
| -rw-r--r-- | lldb/lit/Process/TestEnvironment.test | 7 | ||||
| -rw-r--r-- | lldb/source/Commands/CommandObjectProcess.cpp | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/lldb/lit/Process/Inputs/env.cpp b/lldb/lit/Process/Inputs/env.cpp new file mode 100644 index 00000000000..cbf671ccd2f --- /dev/null +++ b/lldb/lit/Process/Inputs/env.cpp @@ -0,0 +1,7 @@ +#include <cstdlib> +#include <iostream> + +int main() { + if (const char *env_p = std::getenv("FOO")) + std::cout << "FOO=" << env_p << '\n'; +} diff --git a/lldb/lit/Process/TestEnvironment.test b/lldb/lit/Process/TestEnvironment.test new file mode 100644 index 00000000000..8bbf8767f33 --- /dev/null +++ b/lldb/lit/Process/TestEnvironment.test @@ -0,0 +1,7 @@ +The double quotes around "BAR" ensure we don't match the command. + +RUN: %clangxx -std=c++11 %p/Inputs/env.cpp -o %t +RUN: %lldb %t -o 'process launch --environment FOO="BAR"' | FileCheck %s +RUN: %lldb %t -o 'env FOO="BAR"' -o 'process launch' | FileCheck %s + +CHECK: FOO=BAR diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp index 1cc0b0b43c7..b20a2d53333 100644 --- a/lldb/source/Commands/CommandObjectProcess.cpp +++ b/lldb/source/Commands/CommandObjectProcess.cpp @@ -193,7 +193,10 @@ protected: if (target->GetDisableSTDIO()) m_options.launch_info.GetFlags().Set(eLaunchFlagDisableSTDIO); - m_options.launch_info.GetEnvironment() = target->GetEnvironment(); + // Merge the launch info environment with the target environment. + Environment target_env = target->GetEnvironment(); + m_options.launch_info.GetEnvironment().insert(target_env.begin(), + target_env.end()); if (!target_settings_argv0.empty()) { m_options.launch_info.GetArguments().AppendArgument( |
