diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2011-10-26 21:01:18 +0300 |
|---|---|---|
| committer | Ville Skyttä <ville.skytta@iki.fi> | 2011-10-26 21:01:18 +0300 |
| commit | 099b47c66d48537311d53493dca67017c2493f84 (patch) | |
| tree | 55f3ee293e28181ffb0f0ada6841a3ed3dd18bfc /test | |
| parent | 79ac9b592131e434575beaf2204210c32d9b304a (diff) | |
| download | bash-completion-099b47c66d48537311d53493dca67017c2493f84.tar.gz | |
kill, killall: Add some option and argument completions, simplify _signals.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/completions/kill.exp | 8 | ||||
| -rw-r--r-- | test/lib/completions/killall.exp | 2 | ||||
| -rw-r--r-- | test/lib/library.exp | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/test/lib/completions/kill.exp b/test/lib/completions/kill.exp index 1e80fe69..bc07bc48 100644 --- a/test/lib/completions/kill.exp +++ b/test/lib/completions/kill.exp @@ -12,14 +12,16 @@ setup assert_complete_any "kill 1" - - sync_after_int -assert_complete [get_signals] "kill -" +assert_complete [get_signals] "kill -s " +sync_after_int +set expected [get_signals -] +lappend expected "-l" "-s" +assert_complete [lsort -unique $expected] "kill -" sync_after_int diff --git a/test/lib/completions/killall.exp b/test/lib/completions/killall.exp index ae8b3d60..1ee3ade8 100644 --- a/test/lib/completions/killall.exp +++ b/test/lib/completions/killall.exp @@ -17,7 +17,7 @@ assert_complete_any "killall " sync_after_int -assert_complete [get_signals] "killall -" +assert_complete [get_signals -] "killall -" sync_after_int diff --git a/test/lib/library.exp b/test/lib/library.exp index 4ff2885f..35eddf80 100644 --- a/test/lib/library.exp +++ b/test/lib/library.exp @@ -659,8 +659,9 @@ proc get_hosts_avahi {} { # Get signals # This function is written in analogy to the bash function `_signals()' in # `bash_completion'. +# @param prefix # @return list Signals starting with `SIG', but with the `SIG' prefix removed. -proc get_signals {} { +proc get_signals {{prefix ""}} { set signals {} foreach signal [exec bash -c {compgen -A signal}] { # Does signal start with `SIG'? @@ -668,7 +669,7 @@ proc get_signals {} { # Remove `SIG' prefix set signal [string range $signal 3 end] # Add signal (with dash (-) prefix) to list - lappend signals -$signal + lappend signals $prefix$signal } } return $signals |