Merge pull request #3313 from jfinkels/timeout-kill-after-long-arg

timeout: support long form of --kill-after arg
uutils · Mar 27, 2022 · 9a0ef9a · 9a0ef9a
2 parents 2399982 + c43ef8b
commit 9a0ef9a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs
@@ -134,7 +134,9 @@ pub fn uu_app<'a>() -> Command<'a> {
         )
         .arg(
             Arg::new(options::KILL_AFTER)
+                .long(options::KILL_AFTER)
                 .short('k')
+                .help("also send a KILL signal if COMMAND is still running this long after the initial signal was sent")
                 .takes_value(true))
         .arg(
             Arg::new(options::PRESERVE_STATUS)

diff --git a/tests/by-util/test_timeout.rs b/tests/by-util/test_timeout.rs
@@ -105,3 +105,13 @@ fn test_invalid_signal() {
         .fails()
         .usage_error("'invalid': invalid signal");
 }
+
+/// Test that the long form of the `--kill-after` argument is recognized.
+#[test]
+fn test_kill_after_long() {
+    new_ucmd!()
+        .args(&["--kill-after=1", "1", "sleep", "0"])
+        .succeeds()
+        .no_stdout()
+        .no_stderr();
+}