diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs index 6723f45d4..2974eb9cc 100644 --- a/src/uu/rm/src/rm.rs +++ b/src/uu/rm/src/rm.rs @@ -51,7 +51,7 @@ static OPT_PROMPT_MORE: &str = "prompt-more"; static OPT_RECURSIVE: &str = "recursive"; static OPT_RECURSIVE_R: &str = "recursive_R"; static OPT_VERBOSE: &str = "verbose"; -static PRESUME_INPUT_TTY: &str = "presume-input-tty"; +static PRESUME_INPUT_TTY: &str = "-presume-input-tty"; static ARG_FILES: &str = "files"; @@ -219,9 +219,12 @@ pub fn uu_app<'a>() -> App<'a> { // It is relatively difficult to ensure that there is a tty on stdin. // Since rm acts differently depending on that, without this option, // it'd be harder to test the parts of rm that depend on that setting. + // In contrast with Arg::long, Arg::alias does not strip leading + // hyphens. Therefore it supports 3 leading hyphens. .arg( Arg::new(PRESUME_INPUT_TTY) .long(PRESUME_INPUT_TTY) + .alias(PRESUME_INPUT_TTY) .hide(true) ) .arg( diff --git a/tests/by-util/test_rm.rs b/tests/by-util/test_rm.rs index 70d0efd36..f813f071c 100644 --- a/tests/by-util/test_rm.rs +++ b/tests/by-util/test_rm.rs @@ -316,19 +316,6 @@ fn test_rm_verbose_slash() { } #[test] -fn test_rm_silently_accepts_presume_input_tty1() { - let (at, mut ucmd) = at_and_ucmd!(); - let file_1 = "test_rm_silently_accepts_presume_input_tty1"; - - at.touch(file_1); - - ucmd.arg("--presume-input-tty").arg(file_1).succeeds(); - - assert!(!at.file_exists(file_1)); -} - -#[test] -#[ignore] fn test_rm_silently_accepts_presume_input_tty2() { let (at, mut ucmd) = at_and_ucmd!(); let file_2 = "test_rm_silently_accepts_presume_input_tty2"; @@ -339,16 +326,3 @@ fn test_rm_silently_accepts_presume_input_tty2() { assert!(!at.file_exists(file_2)); } - -#[test] -#[ignore] -fn test_rm_silently_accepts_presume_input_tty3() { - let (at, mut ucmd) = at_and_ucmd!(); - let file_3 = "test_rm_silently_accepts_presume_input_tty3"; - - at.touch(file_3); - - ucmd.arg("----presume-input-tty").arg(file_3).succeeds(); - - assert!(!at.file_exists(file_3)); -}