mirror of
https://github.com/uutils/coreutils
synced 2024-12-04 18:39:52 +00:00
mv: fix the output of an error message
+ adjust a GNU test Should make tests/mv/dup-source.sh pass
This commit is contained in:
parent
fb1874bff9
commit
7ffe3d49ef
3 changed files with 34 additions and 1 deletions
|
@ -488,7 +488,7 @@ fn move_files_into_dir(files: &[PathBuf], target_dir: &Path, options: &Options)
|
|||
format!(
|
||||
"cannot move '{}' to a subdirectory of itself, '{}/{}'",
|
||||
sourcepath.display(),
|
||||
target_dir.display(),
|
||||
uucore::fs::normalize_path(target_dir).display(),
|
||||
canonicalized_target_dir.components().last().map_or_else(
|
||||
|| target_dir.display().to_string(),
|
||||
|dir| { PathBuf::from(dir.as_os_str()).display().to_string() }
|
||||
|
|
|
@ -1732,3 +1732,23 @@ fn test_mv_error_msg_with_multiple_sources_that_does_not_exist() {
|
|||
.stderr_contains("mv: cannot stat 'a': No such file or directory")
|
||||
.stderr_contains("mv: cannot stat 'b/': No such file or directory");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_mv_error_cant_move_itself() {
|
||||
let scene = TestScenario::new(util_name!());
|
||||
let at = &scene.fixtures;
|
||||
at.mkdir("b");
|
||||
scene
|
||||
.ucmd()
|
||||
.arg("b")
|
||||
.arg("b/")
|
||||
.fails()
|
||||
.stderr_contains("mv: cannot move 'b' to a subdirectory of itself, 'b/b'");
|
||||
scene
|
||||
.ucmd()
|
||||
.arg("./b")
|
||||
.arg("b")
|
||||
.arg("b/")
|
||||
.fails()
|
||||
.stderr_contains("mv: cannot move 'b' to a subdirectory of itself, 'b/b'");
|
||||
}
|
||||
|
|
13
util/gnu-patches/tests_dup_source.patch
Normal file
13
util/gnu-patches/tests_dup_source.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/tests/mv/dup-source.sh b/tests/mv/dup-source.sh
|
||||
index 7bcd82fc3..0f9005296 100755
|
||||
--- a/tests/mv/dup-source.sh
|
||||
+++ b/tests/mv/dup-source.sh
|
||||
@@ -83,7 +83,7 @@ $i: cannot stat 'a': No such file or directory
|
||||
$i: cannot stat 'a': No such file or directory
|
||||
$i: cannot stat 'b': No such file or directory
|
||||
$i: cannot move './b' to a subdirectory of itself, 'b/b'
|
||||
-$i: warning: source directory 'b' specified more than once
|
||||
+$i: cannot move 'b' to a subdirectory of itself, 'b/b'
|
||||
EOF
|
||||
compare exp out || fail=1
|
||||
done
|
Loading…
Reference in a new issue