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

[lldb] Fix 'r' and 'run' aliases on Apple Silicon 

The 'r' and 'run' aliases were different based on the target
architecture. I suspect the intention was to disable shell expansion on
embedded devices. This fixes TestCustomShell.test on AS.
This commit is contained in:
Jonas Devlieghere 2021-02-11 20:20:04 -08:00
parent db00953ff3
commit 4d3a061c32
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lldb/source/Interpreter/CommandInterpreter.cpp
View File

@ -417,24 +417,20 @@ void CommandInterpreter::Initialize() {
cmd_obj_sp = GetCommandSPExact("process launch");
if (cmd_obj_sp) {
alias_arguments_vector_sp = std::make_shared<OptionArgVector>();
#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__)
#if defined(__APPLE__)
#if defined(TARGET_OS_IPHONE)
AddAlias("r", cmd_obj_sp, "--");
AddAlias("run", cmd_obj_sp, "--");
#else
#if defined(__APPLE__)
std::string shell_option;
shell_option.append("--shell-expand-args");
shell_option.append(" true");
shell_option.append(" --");
AddAlias("r", cmd_obj_sp, "--shell-expand-args true --");
AddAlias("run", cmd_obj_sp, "--shell-expand-args true --");
#endif
#else
StreamString defaultshell;
defaultshell.Printf("--shell=%s --",
HostInfo::GetDefaultShell().GetPath().c_str());
AddAlias("r", cmd_obj_sp, defaultshell.GetString());
AddAlias("run", cmd_obj_sp, defaultshell.GetString());
#endif
#endif
}

4
lldb/test/Shell/Host/TestCustomShell.test
View File

@ -1,7 +1,5 @@
# This test applies to POSIX.
# UNSUPPORTED: system-windows
# FIXME: ShellExpandArguments is unimplemented on the following targets.
# UNSUPPORTED: system-windows
# UNSUPPORTED: system-linux
# XFAIL: system-freebsd
# XFAIL: system-netbsd