diff options
author | Jonas Devlieghere <jonas@devlieghere.com> | 2019-12-21 17:28:36 -0800 |
---|---|---|
committer | Jonas Devlieghere <jonas@devlieghere.com> | 2019-12-21 17:35:29 -0800 |
commit | 5e32eb1c7a816a1902f6229f7a1f9da92678f451 (patch) | |
tree | 96f32fb16ae3b9b3f349c801d93f8c3f245ac033 | |
parent | 8983d69144d14d6477c377bb91e9c7224e32f753 (diff) | |
download | llvm-5e32eb1c7a816a1902f6229f7a1f9da92678f451.zip llvm-5e32eb1c7a816a1902f6229f7a1f9da92678f451.tar.gz llvm-5e32eb1c7a816a1902f6229f7a1f9da92678f451.tar.bz2 |
[lldb/Commands] Honor the scripting language passed
This ensures that breakpoint command honors the scripting language
passed with `-s`. Currently the argument ignores the actual language and
only uses it to differentiate between lldb and script commands.
-rw-r--r-- | lldb/source/Commands/CommandObjectBreakpointCommand.cpp | 4 | ||||
-rw-r--r-- | lldb/test/Shell/ScriptInterpreter/Python/scripted_breakpoint.test | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp index 0cc46a9..73153cf 100644 --- a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp +++ b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp @@ -19,7 +19,6 @@ #include "lldb/Interpreter/OptionGroupPythonClassWithDict.h" #include "lldb/Target/Target.h" - using namespace lldb; using namespace lldb_private; @@ -415,7 +414,8 @@ protected: // to set or collect command callback. Otherwise, call the methods // associated with this object. if (m_options.m_use_script_language) { - ScriptInterpreter *script_interp = GetDebugger().GetScriptInterpreter(); + ScriptInterpreter *script_interp = GetDebugger().GetScriptInterpreter( + /*can_create=*/true, m_options.m_script_language); // Special handling for one-liner specified inline. if (m_options.m_use_one_liner) { script_interp->SetBreakpointCommandCallback( diff --git a/lldb/test/Shell/ScriptInterpreter/Python/scripted_breakpoint.test b/lldb/test/Shell/ScriptInterpreter/Python/scripted_breakpoint.test new file mode 100644 index 0000000..c49124a --- /dev/null +++ b/lldb/test/Shell/ScriptInterpreter/Python/scripted_breakpoint.test @@ -0,0 +1,11 @@ +# REQUIRES: python +# +# Test that the scripting language argument to "breakpoint command" is honored +# even if the global scripting language is different. +# +# RUN: cat %s | %lldb --script-language none 2>&1 | FileCheck %s +b main +breakpoint command add -s python +print("foo") +DONE +# CHECK: Enter your Python command(s). Type 'DONE' to end. |