From 37ac49ee35f52f8fad557911dba9f0e7f0b4ce1b Mon Sep 17 00:00:00 2001 From: karanabe <152078880+karanabe@users.noreply.github.com> Date: Sat, 2 May 2026 16:40:25 +0900 Subject: [PATCH] cp: fix fail-perm GNU test adaptation GNU coreutils 9.11 changed fail-perm.sh to use the EACCES helper in the expected diagnostics. Match the full diagnostic line so the existing uutils message adaptation still applies. --- util/build-gnu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 06eafcd94..053e15929 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -194,8 +194,8 @@ sed -i "s|--coreutils-prog=||g" tests/misc/coreutils.sh sed -i "s|grep '^#define HAVE_CAP 1' \$CONFIG_HEADER > /dev/null|true|" tests/ls/capability.sh # our messages are better -sed -i "s|cannot stat 'symlink': Permission denied|not writing through dangling symlink 'symlink'|" tests/cp/fail-perm.sh -sed -i "s|cp: target directory 'symlink': Permission denied|cp: 'symlink' is not a directory|" tests/cp/fail-perm.sh +sed -i "s|cp: cannot stat 'symlink': .*|cp: not writing through dangling symlink 'symlink'|" tests/cp/fail-perm.sh +sed -i "s|cp: target directory 'symlink': .*|cp: 'symlink' is not a directory|" tests/cp/fail-perm.sh # Our message is a bit better sed -i "s|cannot create regular file 'no-such/': Not a directory|'no-such/' is not a directory|" tests/mv/trailing-slash.sh