From f6d581fc48027528a89e58236a66475aca4e3c80 Mon Sep 17 00:00:00 2001 From: oech3 <79379754+oech3@users.noreply.github.com> Date: Fri, 28 Nov 2025 04:38:07 +0900 Subject: [PATCH] build-gnu.sh: Remove hfs dep from hardlink-case.sh (#9482) Co-authored-by: Sylvestre Ledru --- util/build-gnu.sh | 4 ++++ util/why-skip.md | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 91bbc114f..c5bf37267 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -5,6 +5,7 @@ # spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW # spell-checker:ignore baddecode submodules xstrtol distros ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed multihardlink texinfo CARGOFLAGS # spell-checker:ignore openat TOCTOU CFLAGS +# spell-checker:ignore hfsplus casefold chattr set -e @@ -167,6 +168,9 @@ 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" +# Remove hfs dependency (should be merged to upstream) +"${SED}" -i -e "s|hfsplus|ext4 -O casefold|" -e "s|cd mnt|rm -d mnt/lost+found;chattr +F mnt;cd mnt|" tests/mv/hardlink-case.sh + # 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 diff --git a/util/why-skip.md b/util/why-skip.md index 915b9460e..19310a71e 100644 --- a/util/why-skip.md +++ b/util/why-skip.md @@ -13,9 +13,6 @@ = LD_PRELOAD was ineffective? = * tests/cp/nfs-removal-race.sh -= failed to create hfs file system = -* tests/mv/hardlink-case.sh - = temporarily disabled = * tests/mkdir/writable-under-readonly.sh