diff options
author | Jim Meyering <meyering@fb.com> | 2013-02-07 09:43:41 -0800 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2013-02-07 20:02:45 +0100 |
commit | 1f1f41db85c559285c9969e1a1a3430a872d0722 (patch) | |
tree | 7d7801b6e568dc74199647392019cc8295aa3157 | |
parent | 786db9ef54516c56b68495c7c4c64a58a61457b1 (diff) | |
download | coreutils-1f1f41db85c559285c9969e1a1a3430a872d0722.tar.gz coreutils-1f1f41db85c559285c9969e1a1a3430a872d0722.tar.bz2 coreutils-1f1f41db85c559285c9969e1a1a3430a872d0722.zip |
tests: avoid actual/expected mismatch due to changed diagnostic
* tests/cp/fail-perm.sh: Adjust expected diagnostic to match
just-changed cp diagnostic.
* tests/ln/hard-to-sym.sh: Likewise.
* .mailmap: Also map my new address.
-rw-r--r-- | .mailmap | 1 | ||||
-rwxr-xr-x | tests/cp/fail-perm.sh | 2 | ||||
-rwxr-xr-x | tests/ln/hard-to-sym.sh | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,5 @@ # Map git author names and email addresses to canonical/preferred form. +<jim@meyering.net> <meyering@fb.com> <jim@meyering.net> <meyering@iou.iou> <jim@meyering.net> <meyering@redhat.com> <jim@meyering.net> <meyering@rho.meyering.net> diff --git a/tests/cp/fail-perm.sh b/tests/cp/fail-perm.sh index 29c119bad..8665449a8 100755 --- a/tests/cp/fail-perm.sh +++ b/tests/cp/fail-perm.sh @@ -38,7 +38,7 @@ chmod 0 D ln -s D/D symlink touch F cat > exp <<\EOF -cp: accessing 'symlink': Permission denied +cp: failed to access 'symlink': Permission denied EOF cp F symlink 2> out && fail=1 diff --git a/tests/ln/hard-to-sym.sh b/tests/ln/hard-to-sym.sh index bfe4270b9..26de099a7 100755 --- a/tests/ln/hard-to-sym.sh +++ b/tests/ln/hard-to-sym.sh @@ -53,7 +53,7 @@ esac ln -s /no-such-dir || framework_failure_ ln -L no-such-dir hard-to-dangle 2>err && fail=1 case $(cat err) in - *" accessing 'no-such-dir'":*) ;; + *" failed to access 'no-such-dir'":*) ;; *) fail=1 ;; esac ln -P no-such-dir hard-to-dangle || fail=1 |