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.

diff --git a/.mailmap b/.mailmap
index 8b62317..dcabcb5 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -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 29c119b..8665449 100755 (executable)
--- 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 bfe4270..26de099 100755 (executable)
--- 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