diff options
| -rw-r--r-- | lldb/source/Interpreter/CommandInterpreter.cpp | 2 | ||||
| -rw-r--r-- | lldb/test/functionalities/alias/TestAliases.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index 053bb401b83..16243f9c626 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -316,7 +316,7 @@ CommandInterpreter::Initialize () #if defined (__arm__) ProcessAliasOptionsArgs (cmd_obj_sp, "--", alias_arguments_vector_sp); #else - ProcessAliasOptionsArgs (cmd_obj_sp, "--shell=" LLDB_DEFAULT_SHELL, alias_arguments_vector_sp); + ProcessAliasOptionsArgs (cmd_obj_sp, "--shell=" LLDB_DEFAULT_SHELL " --", alias_arguments_vector_sp); #endif AddAlias ("r", cmd_obj_sp); AddAlias ("run", cmd_obj_sp); diff --git a/lldb/test/functionalities/alias/TestAliases.py b/lldb/test/functionalities/alias/TestAliases.py index 634d8d7e705..590e0ac5618 100644 --- a/lldb/test/functionalities/alias/TestAliases.py +++ b/lldb/test/functionalities/alias/TestAliases.py @@ -109,10 +109,10 @@ class AliasTestCase(TestBase): self.expect ("help run", - substrs = [ "'run' is an abbreviation for 'process launch -c /bin/sh'" ]) + substrs = [ "'run' is an abbreviation for 'process launch -c /bin/sh --'" ]) self.expect ("help -a run", - substrs = [ "'run' is an abbreviation for 'process launch -c /bin/sh'" ]) + substrs = [ "'run' is an abbreviation for 'process launch -c /bin/sh --'" ]) self.expect ("help -a", substrs = [ 'run', 'process launch -c /bin/sh' ]) |
