[Lldb-commits] [lldb] r190103 - Restore -- "end of args" marker for shell

[Ed Maste]

Author: emaste
Date: Thu Sep  5 16:38:45 2013
New Revision: 190103

URL: http://llvm.org/viewvc/llvm-project?rev=190103&view=rev
Log:
Restore -- "end of args" marker for shell

I accidentally dropped this in r189879 in the change from /bin/bash to
/bin/sh.

Modified:
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp
    lldb/trunk/test/functionalities/alias/TestAliases.py

Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=190103&r1=190102&r2=190103&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Thu Sep  5 16:38:45 2013
@@ -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);

Modified: lldb/trunk/test/functionalities/alias/TestAliases.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/alias/TestAliases.py?rev=190103&r1=190102&r2=190103&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/alias/TestAliases.py (original)
+++ lldb/trunk/test/functionalities/alias/TestAliases.py Thu Sep  5 16:38:45 2013
@@ -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' ])