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

[lldb/API] Make Launch(Simple) use args and env from target properties 

Summary:
When no arguments or environment is provided to SBTarget::LaunchSimple,
make it use the values surrently set in the target properties. You can
get the current behavior back by passing an empty array instead.

It seems like using the target defaults is a much more intuitive
behavior for those APIs. It's unllikely that anyone passed NULL/None to
this API after having set properties in order to explicitely ignore them.

One direct application of this change is within the testsuite. We have
plenty of tests calling LaunchSimple and passing None as environment.
If you passed --inferior-env to dotest.py to, for example, set
(DY)LD_LIBRARY_PATH, it wouldn't be taken into account.

Reviewers: jingham, labath, #libc_abi!

Subscribers: libcxx-commits, lldb-commits

Tags: #lldb, #libc_abi

Differential Revision: https://reviews.llvm.org/D76045
This commit is contained in:
Fred Riss 2020-03-11 22:09:11 -07:00
parent 9228a9efc6
commit cd7b45057c
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/include/lldb/API/SBTarget.h
View File

@ -127,7 +127,9 @@ public:
/// The argument array.
///
/// \param[in] envp
/// The environment array.
/// The environment array. If this is null, the default
/// environment values (provided through `settings set
/// target.env-vars`) will be used.
///
/// \param[in] stdin_path
/// The path to use when re-directing the STDIN of the new
@ -175,7 +177,9 @@ public:
/// The argument array.
///
/// \param[in] envp
/// The environment array.
/// The environment array. If this isn't provided, the default
/// environment values (provided through `settings set
/// target.env-vars`) will be used.
///
/// \param[in] working_directory
/// The working directory to have the child process run in

13
lldb/source/API/SBTarget.cpp
View File

@ -371,10 +371,19 @@ SBProcess SBTarget::Launch(SBListener &listener, char const **argv,
Module *exe_module = target_sp->GetExecutableModulePointer();
if (exe_module)
launch_info.SetExecutableFile(exe_module->GetPlatformFileSpec(), true);
if (argv)
if (argv) {
launch_info.GetArguments().AppendArguments(argv);
if (envp)
} else {
auto default_launch_info = target_sp->GetProcessLaunchInfo();
launch_info.GetArguments().AppendArguments(
default_launch_info.GetArguments());
}
if (envp) {
launch_info.GetEnvironment() = Environment(envp);
} else {
auto default_launch_info = target_sp->GetProcessLaunchInfo();
launch_info.GetEnvironment() = default_launch_info.GetEnvironment();
}
if (listener.IsValid())
launch_info.SetListener(listener.GetSP());

22
lldb/test/API/commands/settings/TestSettings.py
View File

@ -204,10 +204,15 @@ class SettingsCommandTestCase(TestBase):
@skipIfDarwinEmbedded # <rdar://problem/34446098> debugserver on ios etc can't write files
def test_run_args_and_env_vars(self):
self.do_test_run_args_and_env_vars(use_launchsimple=False)
@skipIfDarwinEmbedded # <rdar://problem/34446098> debugserver on ios etc can't write files
def test_launchsimple_args_and_env_vars(self):
self.do_test_run_args_and_env_vars(use_launchsimple=True)
def do_test_run_args_and_env_vars(self, use_launchsimple):
"""Test that run-args and env-vars are passed to the launched process."""
self.build()
exe = self.getBuildArtifact("a.out")
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Set the run-args and the env-vars.
# And add hooks to restore the settings during tearDown().
@ -218,7 +223,11 @@ class SettingsCommandTestCase(TestBase):
self.addTearDownHook(
lambda: self.runCmd("settings clear target.env-vars"))
launch_info = self.dbg.GetTargetAtIndex(0).GetLaunchInfo()
exe = self.getBuildArtifact("a.out")
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
target = self.dbg.GetTargetAtIndex(0)
launch_info = target.GetLaunchInfo()
found_env_var = False
for i in range(0, launch_info.GetNumEnvironmentEntries()):
if launch_info.GetEnvironmentEntryAtIndex(i) == "MY_ENV_VAR=YES":
@ -227,7 +236,12 @@ class SettingsCommandTestCase(TestBase):
self.assertTrue(found_env_var,
"MY_ENV_VAR was not set in LunchInfo object")
self.runCmd("process launch --working-dir '{0}'".format(self.get_process_working_directory()),
wd = self.get_process_working_directory()
if use_launchsimple:
process = target.LaunchSimple(None, None, wd)
self.assertTrue(process)
else:
self.runCmd("process launch --working-dir '{0}'".format(wd),
RUN_SUCCEEDED)
# Read the output file produced by running the program.