diff options
| author | Jeff Hamilton <jham@android.com> | 2010-09-10 10:46:06 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2010-09-10 11:16:14 -0500 |
| commit | f41986bbc79055a4feed7266cac5c1b540296daf (patch) | |
| tree | e52d03cd83c1cdbe1d5b7be1537b929b2fcb3187 | |
| parent | bb130ba7998e82e79cd94cddee2b97b1ed977f21 (diff) | |
| download | system_core-f41986bbc79055a4feed7266cac5c1b540296daf.zip system_core-f41986bbc79055a4feed7266cac5c1b540296daf.tar.gz system_core-f41986bbc79055a4feed7266cac5c1b540296daf.tar.bz2 | |
Don't alias 'stop' to 'kill -STOP'
Android has already has a stop command used
to stop the main runtime and the alias
interferes with testing tools that expect
stop to kill the runtime.
Change-Id: I02b7efb9203dc39e97f63eb702a54ff79935b316
| -rw-r--r-- | mksh/src/00-NOTE.txt | 7 | ||||
| -rw-r--r-- | mksh/src/check.t | 3 | ||||
| -rw-r--r-- | mksh/src/main.c | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/mksh/src/00-NOTE.txt b/mksh/src/00-NOTE.txt index 1904d7e..b51d541 100644 --- a/mksh/src/00-NOTE.txt +++ b/mksh/src/00-NOTE.txt @@ -15,5 +15,8 @@ The manual page can be downloaded as PDF (ISO A4 paper) from https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh.pdf or read online at https://www.mirbsd.org/man1/mksh (HTML). -There are currently no changes to the code in this -subdirectory. +The following changes are done to code in this subdirectory +at the moment: +• check.t main.sh: remove the 'stop' alias to 'kill -STOP' + since Android has a built in stop command that the alias + overrides, causing problems with testing tools
\ No newline at end of file diff --git a/mksh/src/check.t b/mksh/src/check.t index 494f66a..c8e8caf 100644 --- a/mksh/src/check.t +++ b/mksh/src/check.t @@ -5351,7 +5351,6 @@ expected-stdout: nohup='nohup ' r='fc -e -' source='PATH=$PATH:. command .' - stop='kill -STOP' suspend='kill -STOP $$' type='whence -v' --- @@ -5421,7 +5420,6 @@ expected-stdout: nohup='nohup ' r='fc -e -' source='PATH=$PATH:. command .' - stop='kill -STOP' suspend='kill -STOP $$' type='whence -v' --- @@ -5446,7 +5444,6 @@ expected-stdout: nohup='nohup ' r='fc -e -' source='PATH=$PATH:. command .' - stop='kill -STOP' suspend='kill -STOP $$' type='whence -v' --- diff --git a/mksh/src/main.c b/mksh/src/main.c index 4c7d4a1..f962dd4 100644 --- a/mksh/src/main.c +++ b/mksh/src/main.c @@ -74,7 +74,6 @@ static const char *initcoms[] = { "hash=alias -t", /* not "alias -t --": hash -r needs to work */ "type=whence -v", #ifndef MKSH_UNEMPLOYED - "stop=kill -STOP", "suspend=kill -STOP $$", #endif "autoload=typeset -fu", |