diff options
| author | Pádraig Brady <P@draigBrady.com> | 2023-04-07 10:25:41 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2023-04-08 12:11:58 +0100 |
| commit | f6c21f6d3addb6461c41af612e73fbb15d21545f (patch) | |
| tree | d5079976206a43071ddd160672f95a200513adf1 /tests/mv/mv-n.sh | |
| parent | db28af406f311ac8f78604cc5906613866aecef5 (diff) | |
| download | coreutils-f6c21f6d3addb6461c41af612e73fbb15d21545f.tar.gz | |
cp,mv: issue "skipped" messages when skipping files
* NEWS: Mention the change in behavior to issue a "not replaced"
error diagnostic with -n, and the "skipped" message with -v.
* src/copy.c (copy_internal): Adjust to output the "skipped" messages
depending on -i, -n, -u.
* tests/cp/cp-i.sh: Adjust accordingly.
* tests/mv/mv-n.sh: Likewise.
Diffstat (limited to 'tests/mv/mv-n.sh')
| -rwxr-xr-x | tests/mv/mv-n.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/mv/mv-n.sh b/tests/mv/mv-n.sh index fbf571368..45d74eb93 100755 --- a/tests/mv/mv-n.sh +++ b/tests/mv/mv-n.sh @@ -23,12 +23,14 @@ print_ver_ mv # test miscellaneous combinations of -f -i -n parameters touch a b || framework_failure_ echo "renamed 'a' -> 'b'" > out_move +echo "skipped 'b'" > out_skip || framework_failure_ +echo "mv: not replacing 'b'" > err_skip || framework_failure_ > out_empty # ask for overwrite, answer no touch a b || framework_failure_ echo n | returns_ 1 mv -vi a b 2>/dev/null > out1 || fail=1 -compare out1 out_empty || fail=1 +compare out1 out_skip || fail=1 # ask for overwrite, answer yes touch a b || framework_failure_ @@ -38,17 +40,23 @@ compare out2 out_move || fail=1 # -n wins (as the last option) touch a b || framework_failure_ echo y | returns_ 1 mv -vin a b 2>/dev/null > out3 || fail=1 +compare out3 out_skip || fail=1 + +# -n wins (non verbose) +touch a b || framework_failure_ +echo y | returns_ 1 mv -in a b 2>err3 > out3 || fail=1 compare out3 out_empty || fail=1 +compare err3 err_skip || fail=1 # -n wins (as the last option) touch a b || framework_failure_ echo y | returns_ 1 mv -vfn a b 2>/dev/null > out4 || fail=1 -compare out4 out_empty || fail=1 +compare out4 out_skip || fail=1 # -n wins (as the last option) touch a b || framework_failure_ echo y | returns_ 1 mv -vifn a b 2>/dev/null > out5 || fail=1 -compare out5 out_empty || fail=1 +compare out5 out_skip || fail=1 # options --backup and --no-clobber are mutually exclusive touch a || framework_failure_ |