mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37:44 +00:00
cp: correct --verbose --parents output for dirs
This commit corrects the behavior of `cp -r --parents --verbose` when the source path is a directory, so that it prints the copied ancestor directories. For example, $ mkdir -p a/b/c d $ cp -r --verbose --parents a/b/c d a -> d/a a/b -> d/a/b 'a/b/c' -> 'd/a/b/c'
This commit is contained in:
parent
bd665ea44a
commit
1a839fb2c4
2 changed files with 111 additions and 4 deletions
|
@ -2087,6 +2087,36 @@ fn test_cp_parents_2_link() {
|
|||
assert!(at.file_exists("d/a/link/c"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_cp_parents_2_dir() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
at.mkdir_all("a/b/c");
|
||||
at.mkdir("d");
|
||||
#[cfg(not(windows))]
|
||||
let expected_stdout = "a -> d/a\na/b -> d/a/b\n'a/b/c' -> 'd/a/b/c'\n";
|
||||
#[cfg(windows)]
|
||||
let expected_stdout = "a -> d\\a\na/b -> d\\a/b\n'a/b/c' -> 'd\\a/b\\c'\n";
|
||||
ucmd.args(&["--verbose", "-r", "--parents", "a/b/c", "d"])
|
||||
.succeeds()
|
||||
.stdout_only(expected_stdout);
|
||||
assert!(at.dir_exists("d/a/b/c"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_cp_parents_2_deep_dir() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
at.mkdir_all("a/b/c");
|
||||
at.mkdir_all("d/e");
|
||||
#[cfg(not(windows))]
|
||||
let expected_stdout = "a -> d/e/a\na/b -> d/e/a/b\n'a/b/c' -> 'd/e/a/b/c'\n";
|
||||
#[cfg(windows)]
|
||||
let expected_stdout = "a -> d/e\\a\na/b -> d/e\\a/b\n'a/b/c' -> 'd/e\\a/b\\c'\n";
|
||||
ucmd.args(&["--verbose", "-r", "--parents", "a/b/c", "d/e"])
|
||||
.succeeds()
|
||||
.stdout_only(expected_stdout);
|
||||
assert!(at.dir_exists("d/e/a/b/c"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_cp_copy_symlink_contents_recursive() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
|
@ -2409,3 +2439,18 @@ fn test_symbolic_link_file() {
|
|||
Path::new("src")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_src_base_dot() {
|
||||
let ts = TestScenario::new(util_name!());
|
||||
let at = ts.fixtures.clone();
|
||||
at.mkdir("x");
|
||||
at.mkdir("y");
|
||||
let mut ucmd = UCommand::new(ts.bin_path, &Some(ts.util_name), at.plus("y"), true);
|
||||
|
||||
ucmd.args(&["--verbose", "-r", "../x/.", "."])
|
||||
.succeeds()
|
||||
.no_stderr()
|
||||
.no_stdout();
|
||||
assert!(!at.dir_exists("y/x"));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue