Skip to content

Commit 58095fa

Browse files
committed
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.
1 parent 0e74a34 commit 58095fa

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

util/build-gnu.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,9 @@ else
200200
touch gnu-built
201201
fi
202202

203-
grep -rl 'path_prepend_' tests/* | xargs sed -i 's| path_prepend_ ./src||'
203+
grep -rl 'path_prepend_' tests/* | xargs -r sed -i 's| path_prepend_ ./src||'
204+
# path_prepend_ sets $abs_path_dir_: set it manually instead.
205+
grep -rl '\$abs_path_dir_' tests/*/*.sh | xargs -r sed -i "s|\$abs_path_dir_|${UU_BUILD_DIR//\//\\/}|g"
204206

205207
# Use the system coreutils where the test fails due to error in a util that is not the one being tested
206208
sed -i "s|grep '^#define HAVE_CAP 1' \$CONFIG_HEADER > /dev/null|true|" tests/ls/capability.sh

0 commit comments

Comments
 (0)