diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/cp/cp-i.sh | 9 | ||||
| -rwxr-xr-x | tests/cp/debug.sh | 4 | ||||
| -rwxr-xr-x | tests/mv/mv-n.sh | 9 |
3 files changed, 12 insertions, 10 deletions
diff --git a/tests/cp/cp-i.sh b/tests/cp/cp-i.sh index 4458b2edd..a9178a99e 100755 --- a/tests/cp/cp-i.sh +++ b/tests/cp/cp-i.sh @@ -29,13 +29,12 @@ echo n | returns_ 1 cp -iR a b 2>/dev/null || fail=1 # test miscellaneous combinations of -f -i -n parameters touch c d || framework_failure_ echo "'c' -> 'd'" > out_copy || framework_failure_ -echo "skipped 'd'" > out_skip || framework_failure_ echo "cp: not replacing 'd'" > err_skip || framework_failure_ touch out_empty || framework_failure_ # ask for overwrite, answer no echo n | returns_ 1 cp -vi c d 2>/dev/null > out1 || fail=1 -compare out1 out_skip || fail=1 +compare out1 out_empty || fail=1 # ask for overwrite, answer yes echo y | cp -vi c d 2>/dev/null > out2 || fail=1 @@ -47,7 +46,7 @@ compare out3 out_copy || fail=1 # -n wins over -i echo y | returns_ 1 cp -vin c d 2>/dev/null > out4 || fail=1 -compare out4 out_skip || fail=1 +compare out4 out_empty || fail=1 # -n wins over -i non verbose echo y | returns_ 1 cp -in c d 2>err4 > out4 || fail=1 @@ -60,11 +59,11 @@ compare out5 out_copy || fail=1 # do not ask, prevent from overwrite echo n | returns_ 1 cp -vfn c d 2>/dev/null > out6 || fail=1 -compare out6 out_skip || fail=1 +compare out6 out_empty || fail=1 # do not ask, prevent from overwrite echo n | returns_ 1 cp -vnf c d 2>/dev/null > out7 || fail=1 -compare out7 out_skip || fail=1 +compare out7 out_empty || fail=1 # options --backup and --no-clobber are mutually exclusive returns_ 1 cp -bn c d 2>/dev/null || fail=1 diff --git a/tests/cp/debug.sh b/tests/cp/debug.sh index b46adc637..242894de2 100755 --- a/tests/cp/debug.sh +++ b/tests/cp/debug.sh @@ -25,4 +25,8 @@ grep 'copy offload:.*reflink:.*sparse detection:' cp.out || fail=1 cp --debug --attributes-only file file.cp >cp.out || fail=1 returns_ 1 grep 'copy offload:.*reflink:.*sparse detection:' cp.out || fail=1 +touch file.cp || framework_failure_ +cp --debug --update=none file file.cp >cp.out || fail=1 +grep 'skipped' cp.out || fail=1 + Exit $fail diff --git a/tests/mv/mv-n.sh b/tests/mv/mv-n.sh index 45d74eb93..60547807c 100755 --- a/tests/mv/mv-n.sh +++ b/tests/mv/mv-n.sh @@ -23,14 +23,13 @@ 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_skip || fail=1 +compare out1 out_empty || fail=1 # ask for overwrite, answer yes touch a b || framework_failure_ @@ -40,7 +39,7 @@ 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 +compare out3 out_empty || fail=1 # -n wins (non verbose) touch a b || framework_failure_ @@ -51,12 +50,12 @@ 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_skip || fail=1 +compare out4 out_empty || 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_skip || fail=1 +compare out5 out_empty || fail=1 # options --backup and --no-clobber are mutually exclusive touch a || framework_failure_ |