From d6c793c09abb43078ef6ecff6b8f49eccb0cc015 Mon Sep 17 00:00:00 2001 From: Etienne Cordonnier Date: Tue, 27 Jan 2026 10:25:17 +0100 Subject: [PATCH] build-gnu.sh: remove workaround for timeout/yes Now that https://github.com/uutils/coreutils/issues/7252 is fixed this workaround is not needed any more: This is a partial revert of https://github.com/uutils/coreutils/commit/fac6c2951d5ae22eed1517bff28169ebdb37ef3d ("util/build-gnu.sh: Bypass timeout/yes SIGPIPE handling bug") This is a revert of https://github.com/uutils/coreutils/commit/5004d4b45870a5b2e7cc90c87b04e85f7f725f30 ("build-gnu: replace `timeout` for `tests/tail/follow-stdin.sh`") Signed-off-by: Etienne Cordonnier --- util/build-gnu.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 7a9f45c385b..0d1c6d9e114 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -15,7 +15,6 @@ command -v gsed && sed(){ gsed "$@";} SED=$(command -v gsed||command -v sed) # for find...exec... SYSTEM_TIMEOUT=$(command -v timeout) -SYSTEM_YES=$(command -v yes) ME="${0}" ME_dir="$(dirname -- "$(readlink -fm -- "${ME}")")" @@ -187,13 +186,6 @@ sed -i "s|cannot create regular file 'no-such/': Not a directory|'no-such/' is n # Our message is better sed -i "s|warning: unrecognized escape|warning: incomplete hex escape|" tests/stat/stat-printf.pl -sed -i 's|timeout |'"${SYSTEM_TIMEOUT}"' |' tests/tail/follow-stdin.sh - -# trap_sigpipe_or_skip_ fails with uutils tools because of a bug in -# timeout/yes (https://github.com/uutils/coreutils/issues/7252), so we use -# system's yes/timeout to make sure the tests run (instead of being skipped). -sed -i 's|\(trap .* \)timeout\( .* \)yes|'"\1${SYSTEM_TIMEOUT}\2${SYSTEM_YES}"'|' init.cfg - # Remove dup of /usr/bin/ and /usr/local/bin/ when executed several times grep -rlE '/usr/bin/\s?/usr/bin' init.cfg tests/* | xargs -r "${SED}" -Ei 's|/usr/bin/\s?/usr/bin/|/usr/bin/|g' grep -rlE '/usr/local/bin/\s?/usr/local/bin' init.cfg tests/* | xargs -r "${SED}" -Ei 's|/usr/local/bin/\s?/usr/local/bin/|/usr/local/bin/|g'