From 58095fa70d50dcc594e3b9e307bb788ba7ea725f Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Thu, 24 Jul 2025 15:17:20 +0800 Subject: [PATCH] util/build-gnu.sh: Replace $abs_path_dir_ path_prepend_ sets $abs_path_dir_, but the sed command above removes it. Set it manually instead. Fixes part of tests/cp/preserve-gid. --- util/build-gnu.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 21286515d..f62701600 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -200,7 +200,9 @@ else touch gnu-built fi -grep -rl 'path_prepend_' tests/* | xargs sed -i 's| path_prepend_ ./src||' +grep -rl 'path_prepend_' tests/* | xargs -r sed -i 's| path_prepend_ ./src||' +# path_prepend_ sets $abs_path_dir_: set it manually instead. +grep -rl '\$abs_path_dir_' tests/*/*.sh | xargs -r sed -i "s|\$abs_path_dir_|${UU_BUILD_DIR//\//\\/}|g" # Use the system coreutils where the test fails due to error in a util that is not the one being tested sed -i "s|grep '^#define HAVE_CAP 1' \$CONFIG_HEADER > /dev/null|true|" tests/ls/capability.sh