diff --git a/util/build-gnu.sh b/util/build-gnu.sh index ff29e119b22..626400d6a57 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -135,6 +135,7 @@ else ./bootstrap --skip-po # Use CFLAGS for best build time since we discard GNU coreutils CFLAGS="${CFLAGS} -pipe -O0 -s" ./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references \ + --enable-single-binary=symlinks \ "$([ "${SELINUX_ENABLED}" = 1 ] && echo --with-selinux || echo --without-selinux)" #Add timeout to to protect against hangs "${SED}" -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver @@ -169,6 +170,11 @@ 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" +# We use coreutils yes +"${SED}" -i "s|--coreutils-prog=||g" tests/misc/coreutils.sh +# Different message +"${SED}" -i "s|coreutils: unknown program 'blah'|blah: function/utility not found|" tests/misc/coreutils.sh + # 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 diff --git a/util/why-skip.md b/util/why-skip.md index f179a58bb1c..b0c181944b5 100644 --- a/util/why-skip.md +++ b/util/why-skip.md @@ -44,9 +44,6 @@ = The Swedish locale with blank thousands separator is unavailable. = * tests/misc/sort-h-thousands-sep.sh -= multicall binary is disabled = -* tests/misc/coreutils.sh - = not running on GNU/Hurd = * tests/id/gnu-zero-uids.sh