diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 70886e5e912..7cda49fbefb 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -124,7 +124,7 @@ else : > man/local.mk # Use CFLAGS for best build time since we discard GNU coreutils CFLAGS="${CFLAGS} -pipe -O0 -s" ./configure -C --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references \ - --enable-single-binary=symlinks --enable-install-program="arch,kill,uptime,hostname" \ + --enable-single-binary=hardlinks --enable-install-program="arch,kill,uptime,hostname" \ "$([ "${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 diff --git a/util/fetch-gnu.sh b/util/fetch-gnu.sh index a242b66061d..afd9ebfa88a 100755 --- a/util/fetch-gnu.sh +++ b/util/fetch-gnu.sh @@ -1,29 +1,10 @@ #!/bin/bash -e -ver="9.9" +ver="9.10" repo=https://github.com/coreutils/coreutils curl -L "${repo}/releases/download/v${ver}/coreutils-${ver}.tar.xz" | tar --strip-components=1 -xJf - -# TODO stop backporting tests from master at GNU coreutils > 9.9 -curl -L ${repo}/raw/refs/heads/master/tests/timeout/timeout.sh > tests/timeout/timeout.sh -curl -L ${repo}/raw/refs/heads/master/tests/timeout/timeout-group.sh > tests/timeout/timeout-group.sh -curl -L ${repo}/raw/refs/heads/master/tests/mv/hardlink-case.sh > tests/mv/hardlink-case.sh -curl -L ${repo}/raw/refs/heads/master/tests/mkdir/writable-under-readonly.sh > tests/mkdir/writable-under-readonly.sh -curl -L ${repo}/raw/refs/heads/master/tests/cp/cp-mv-enotsup-xattr.sh > tests/cp/cp-mv-enotsup-xattr.sh #spell-checker:disable-line -curl -L ${repo}/raw/refs/heads/master/tests/cp/nfs-removal-race.sh > tests/cp/nfs-removal-race.sh -curl -L ${repo}/raw/refs/heads/master/tests/csplit/csplit-io-err.sh > tests/csplit/csplit-io-err.sh -# Replace tests not compatible with our binaries -sed -i -e 's/no-mtab-status.sh/no-mtab-status-masked-proc.sh/' -e 's/nproc-quota.sh/nproc-quota-systemd.sh/' tests/local.mk -curl -L ${repo}/raw/refs/heads/master/tests/df/no-mtab-status-masked-proc.sh > tests/df/no-mtab-status-masked-proc.sh -curl -L ${repo}/raw/refs/heads/master/tests/nproc/nproc-quota-systemd.sh > tests/nproc/nproc-quota-systemd.sh -curl -L ${repo}/raw/refs/heads/master/tests/stty/bad-speed.sh > tests/stty/bad-speed.sh -# symlink to /bin/false should fail with --help. Freeze commit to avoid regression. -curl -L https://raw.githubusercontent.com/coreutils/coreutils/d5164f3d216917005003877faeb1abe7cae5d765/tests/misc/coreutils.sh > tests/misc/coreutils.sh -# Better support for single binary -curl -L ${repo}/raw/refs/heads/master/tests/env/env.sh > tests/env/env.sh -# Avoid incorrect PASS -curl -L ${repo}/raw/refs/heads/master/tests/runcon/runcon-compute.sh > tests/runcon/runcon-compute.sh -curl -L ${repo}/raw/refs/heads/master/tests/tac/tac-continue.sh > tests/tac/tac-continue.sh -curl -L ${repo}/raw/refs/heads/master/tests/tail/inotify-dir-recreate.sh > tests/tail/inotify-dir-recreate.sh -# Add tac-continue.sh to root tests (it requires root to mount tmpfs) -# Use sed -i.bak for macOS -sed -i.bak 's|tests/split/l-chunk-root.sh.*|tests/split/l-chunk-root.sh\t\t\t\\\n tests/tac/tac-continue.sh\t\t\t\\|' tests/local.mk +# TODO stop backporting tests from master at GNU coreutils > $ver +# backport = () +# for f in ${backport[@]} +# do curl -L ${repo}/raw/refs/heads/master/tests/$f > tests/$f +# done diff --git a/util/gnu-patches/series b/util/gnu-patches/series index 2d9b30b2cc1..f1a24d0f67e 100644 --- a/util/gnu-patches/series +++ b/util/gnu-patches/series @@ -10,4 +10,3 @@ tests_sort_merge.pl.patch tests_du_move_dir_while_traversing.patch test_mkdir_restorecon.patch error_msg_uniq.diff -tests_tail_overlay_headers.patch diff --git a/util/gnu-patches/tests_tail_overlay_headers.patch b/util/gnu-patches/tests_tail_overlay_headers.patch index 205401294a1..c01b718ca78 100644 --- a/util/gnu-patches/tests_tail_overlay_headers.patch +++ b/util/gnu-patches/tests_tail_overlay_headers.patch @@ -31,19 +31,3 @@ -retry_delay_ wait4lines_ .1 6 13 || fail=1 +# Wait for 8 more lines (should total 13) +retry_delay_ wait4lines_ .1 6 13 || { echo "Failed waiting for 13 total lines"; fail=1; } - - kill $sleep && wait || framework_failure_ - --test "$(countlines_)" = 13 || fail=1 -+final_count=$(countlines_) -+echo "=== Final line count: $final_count (expected 13) ===" -+ -+if test "$final_count" != 13; then -+ echo "=== FAILURE: Expected 13 lines, got $final_count ===" -+ echo "=== Full output content: ===" -+ cat -A out -+ echo "=== End output content ===" -+ fail=1 -+fi - - Exit $fail