File tree Expand file tree Collapse file tree 2 files changed +9
-12
lines changed
Expand file tree Collapse file tree 2 files changed +9
-12
lines changed Original file line number Diff line number Diff line change @@ -154,12 +154,7 @@ fn handle_obsolete(args: &mut Vec<String>) -> Option<usize> {
154154}
155155
156156fn table ( ) {
157- // GNU kill doesn't list the EXIT signal with --table, so we ignore it, too
158- for ( idx, signal) in ALL_SIGNALS
159- . iter ( )
160- . enumerate ( )
161- . filter ( |( _, s) | * * s != "EXIT" )
162- {
157+ for ( idx, signal) in ALL_SIGNALS . iter ( ) . enumerate ( ) {
163158 println ! ( "{idx: >#2} {signal}" ) ;
164159 }
165160}
@@ -183,8 +178,7 @@ fn print_signal(signal_name_or_value: &str) -> UResult<()> {
183178}
184179
185180fn print_signals ( ) {
186- // GNU kill doesn't list the EXIT signal with --list, so we ignore it, too
187- for signal in ALL_SIGNALS . iter ( ) . filter ( |x| * * x != "EXIT" ) {
181+ for signal in ALL_SIGNALS {
188182 println ! ( "{signal}" ) ;
189183 }
190184}
Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ fn test_kill_list_all_signals() {
6363 . stdout_contains ( "KILL" )
6464 . stdout_contains ( "TERM" )
6565 . stdout_contains ( "HUP" )
66- . stdout_does_not_contain ( "EXIT" ) ;
66+ . stdout_contains ( "EXIT" ) ;
6767}
6868
6969#[ test]
@@ -80,15 +80,16 @@ fn test_kill_list_all_signals_as_table() {
8080 . succeeds ( )
8181 . stdout_contains ( "KILL" )
8282 . stdout_contains ( "TERM" )
83- . stdout_contains ( "HUP" ) ;
83+ . stdout_contains ( "HUP" )
84+ . stdout_contains ( "EXIT" ) ;
8485}
8586
8687#[ test]
87- fn test_kill_table_starts_at_1 ( ) {
88+ fn test_kill_table_starts_at_0 ( ) {
8889 new_ucmd ! ( )
8990 . arg ( "-t" )
9091 . succeeds ( )
91- . stdout_matches ( & Regex :: new ( "^\\ s?1 \\ sHUP " ) . unwrap ( ) ) ;
92+ . stdout_matches ( & Regex :: new ( "^\\ s?0 \\ sEXIT " ) . unwrap ( ) ) ;
9293}
9394
9495#[ test]
@@ -104,6 +105,7 @@ fn test_kill_table_lists_all_vertically() {
104105 assert ! ( signals. contains( & "KILL" ) ) ;
105106 assert ! ( signals. contains( & "TERM" ) ) ;
106107 assert ! ( signals. contains( & "HUP" ) ) ;
108+ assert ! ( signals. contains( & "EXIT" ) ) ;
107109}
108110
109111#[ test]
@@ -143,6 +145,7 @@ fn test_kill_list_all_vertically() {
143145 assert ! ( signals. contains( & "KILL" ) ) ;
144146 assert ! ( signals. contains( & "TERM" ) ) ;
145147 assert ! ( signals. contains( & "HUP" ) ) ;
148+ assert ! ( signals. contains( & "EXIT" ) ) ;
146149}
147150
148151#[ test]
You can’t perform that action at this time.
0 commit comments