fix --help and --version

This commit is contained in:
Sergei Mironenko
2017-10-28 17:42:40 +03:00
parent f2b952db54
commit f0aa68aa1e
2 changed files with 12 additions and 2 deletions
+2 -2
View File
@@ -86,8 +86,8 @@ pub fn uumain(args: Vec<String>) -> i32 {
}
} else if opt.starts_with("--") {
match opt.as_ref() {
"--help" => { core_opts.parse(vec![String::from("--help")]); return 0; }
"--version" => { core_opts.parse(vec![String::from("--version")]); return 0; }
"--help" => { core_opts.parse(vec![String::new(), String::from("--help")]); return 0; }
"--version" => { core_opts.parse(vec![String::new(), String::from("--version")]); return 0; }
"--ignore-environment" => opts.ignore_env = true,
"--null" => opts.null = true,
+10
View File
@@ -1,6 +1,16 @@
use common::util::*;
#[test]
fn test_env_help() {
assert!(new_ucmd!().arg("--help").succeeds().no_stderr().stdout.contains("Options:"));
}
#[test]
fn test_env_version() {
assert!(new_ucmd!().arg("--version").succeeds().no_stderr().stdout.contains(util_name!()));
}
#[test]
fn test_single_name_value_pair() {
let out = new_ucmd!()