diff options
| -rw-r--r-- | lldb/include/lldb/Host/Host.h | 3 | ||||
| -rw-r--r-- | lldb/include/lldb/lldb-defines.h | 1 | ||||
| -rw-r--r-- | lldb/source/Interpreter/CommandInterpreter.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Target/Process.cpp | 2 | ||||
| -rw-r--r-- | lldb/test/functionalities/alias/TestAliases.py | 8 | ||||
| -rw-r--r-- | lldb/test/pexpect-2.4/doc/index.html | 4 | ||||
| -rw-r--r-- | lldb/test/pexpect-2.4/doc/index.template.html | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/lldb/include/lldb/Host/Host.h b/lldb/include/lldb/Host/Host.h index e75f42bf6dd..1d667dee5a2 100644 --- a/lldb/include/lldb/Host/Host.h +++ b/lldb/include/lldb/Host/Host.h @@ -473,8 +473,7 @@ public: int *signo_ptr, // Pass NULL if you don't want the signal that caused the process to exit std::string *command_output, // Pass NULL if you don't want the command output uint32_t timeout_sec, - const char *shell = "/bin/sh" - ); + const char *shell = LLDB_DEFAULT_SHELL); static lldb::DataBufferSP GetAuxvData (lldb_private::Process *process); diff --git a/lldb/include/lldb/lldb-defines.h b/lldb/include/lldb/lldb-defines.h index 3318aa15f5a..3e1db963ee3 100644 --- a/lldb/include/lldb/lldb-defines.h +++ b/lldb/include/lldb/lldb-defines.h @@ -33,6 +33,7 @@ // LLDB defines //---------------------------------------------------------------------- #define LLDB_GENERIC_ERROR UINT32_MAX +#define LLDB_DEFAULT_SHELL "/bin/sh" //---------------------------------------------------------------------- // Breakpoints diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index db2f2fafbef..09b7dd9c2c9 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -318,7 +318,7 @@ CommandInterpreter::Initialize () #if defined (__arm__) ProcessAliasOptionsArgs (cmd_obj_sp, "--", alias_arguments_vector_sp); #else - ProcessAliasOptionsArgs (cmd_obj_sp, "--shell=/bin/bash --", 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/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 704f1dfc4fc..93406435a4c 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -816,7 +816,7 @@ ProcessLaunchCommandOptions::SetOptionValue (uint32_t option_idx, const char *op if (option_arg && option_arg[0]) launch_info.SetShell (option_arg); else - launch_info.SetShell ("/bin/bash"); + launch_info.SetShell (LLDB_DEFAULT_SHELL); break; case 'v': diff --git a/lldb/test/functionalities/alias/TestAliases.py b/lldb/test/functionalities/alias/TestAliases.py index 99fb1d19fe0..590e0ac5618 100644 --- a/lldb/test/functionalities/alias/TestAliases.py +++ b/lldb/test/functionalities/alias/TestAliases.py @@ -109,16 +109,16 @@ class AliasTestCase(TestBase): self.expect ("help run", - substrs = [ "'run' is an abbreviation for 'process launch -c /bin/bash --'" ]) + 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/bash --'" ]) + substrs = [ "'run' is an abbreviation for 'process launch -c /bin/sh --'" ]) self.expect ("help -a", - substrs = [ 'run', 'process launch -c /bin/bash' ]) + substrs = [ 'run', 'process launch -c /bin/sh' ]) self.expect ("help", matching=False, - substrs = [ "'run'", 'process launch -c /bin/bash' ]) + substrs = [ "'run'", 'process launch -c /bin/sh' ]) self.expect ("run", patterns = [ "Process .* launched: .*a.out" ]) diff --git a/lldb/test/pexpect-2.4/doc/index.html b/lldb/test/pexpect-2.4/doc/index.html index 47ac6f62127..725fe984ce6 100644 --- a/lldb/test/pexpect-2.4/doc/index.html +++ b/lldb/test/pexpect-2.4/doc/index.html @@ -362,7 +362,7 @@ command and pipe it through another command then you must also start a shell. For example: <pre> - child = pexpect.spawn('/bin/bash -c "ls -l | grep LOG > log_list.txt"') + child = pexpect.spawn('/bin/sh -c "ls -l | grep LOG > log_list.txt"') child.expect(pexpect.EOF) </pre> @@ -373,7 +373,7 @@ the previous example: <pre> shell_cmd = 'ls -l | grep LOG > log_list.txt' - child = pexpect.spawn ('/bin/bash', ['-c', shell_cmd]) + child = pexpect.spawn ('/bin/sh', ['-c', shell_cmd]) child.expect (pexpect.EOF) </pre> diff --git a/lldb/test/pexpect-2.4/doc/index.template.html b/lldb/test/pexpect-2.4/doc/index.template.html index 9236df19422..ab63b2dec96 100644 --- a/lldb/test/pexpect-2.4/doc/index.template.html +++ b/lldb/test/pexpect-2.4/doc/index.template.html @@ -362,7 +362,7 @@ command and pipe it through another command then you must also start a shell. For example: <pre> - child = pexpect.spawn('/bin/bash -c "ls -l | grep LOG > log_list.txt"') + child = pexpect.spawn('/bin/sh -c "ls -l | grep LOG > log_list.txt"') child.expect(pexpect.EOF) </pre> @@ -373,7 +373,7 @@ the previous example: <pre> shell_cmd = 'ls -l | grep LOG > log_list.txt' - child = pexpect.spawn ('/bin/bash', ['-c', shell_cmd]) + child = pexpect.spawn ('/bin/sh', ['-c', shell_cmd]) child.expect (pexpect.EOF) </pre> |
