From 1f1f41db85c559285c9969e1a1a3430a872d0722 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 7 Feb 2013 09:43:41 -0800 Subject: 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. --- .mailmap | 1 + tests/cp/fail-perm.sh | 2 +- tests/ln/hard-to-sym.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 8b6231763..dcabcb534 100644 --- a/.mailmap +++ b/.mailmap @@ -1,4 +1,5 @@ # Map git author names and email addresses to canonical/preferred form. + 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 -- cgit v1.2.3