diff options
Diffstat (limited to 'internal/rosa/gnu.go')
| -rw-r--r-- | internal/rosa/gnu.go | 101 |
1 files changed, 97 insertions, 4 deletions
diff --git a/internal/rosa/gnu.go b/internal/rosa/gnu.go index 67f36712..32fe9563 100644 --- a/internal/rosa/gnu.go +++ b/internal/rosa/gnu.go @@ -363,8 +363,8 @@ func init() { func (t Toolchain) newCoreutils() (pkg.Artifact, string) { const ( - version = "9.9" - checksum = "B1_TaXj1j5aiVIcazLWu8Ix03wDV54uo2_iBry4qHG6Y-9bjDpUPlkNLmU_3Nvw6" + version = "9.10" + checksum = "o-B9wssRnZySzJUI1ZJAgw-bZtj1RC67R9po2AcM2OjjS8FQIl16IRHpC6IwO30i" ) return t.NewPackage("coreutils", version, pkg.NewHTTPGetTar( nil, "https://ftpmirror.gnu.org/gnu/coreutils/coreutils-"+version+".tar.gz", @@ -377,12 +377,105 @@ test_disable() { chmod +w "$2" && echo "$1" > "$2"; } test_disable '#!/bin/sh' gnulib-tests/test-c32ispunct.sh test_disable '#!/bin/sh' tests/split/line-bytes.sh -test_disable '#!/bin/sh' tests/dd/no-allocate.sh -test_disable '#!/bin/sh' tests/env/env.sh +test_disable '#!/bin/sh' tests/ls/hyperlink.sh test_disable 'int main(){return 0;}' gnulib-tests/test-chown.c test_disable 'int main(){return 0;}' gnulib-tests/test-fchownat.c test_disable 'int main(){return 0;}' gnulib-tests/test-lchown.c `, + + Patches: [][2]string{ + {"tests-fix-job-control", `From 21d287324aa43aa3a31f39619ade0deac7fd6013 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com> +Date: Tue, 24 Feb 2026 15:44:41 +0000 +Subject: [PATCH] tests: fix job control triggering test termination + +This avoids the test harness being terminated like: + make[1]: *** [Makefile:24419: check-recursive] Hangup + make[3]: *** [Makefile:24668: check-TESTS] Hangup + make: *** [Makefile:24922: check] Hangup + make[2]: *** [Makefile:24920: check-am] Hangup + make[4]: *** [Makefile:24685: tests/misc/usage_vs_refs.log] Error 129 + ... + +This happened sometimes when the tests were being run non interactively. +For example when run like: + + setsid make TESTS="tests/timeout/timeout.sh \ + tests/tail/overlay-headers.sh" SUBDIRS=. -j2 check + +Note the race window can be made bigger by adding a sleep +after tail is stopped in overlay-headers.sh + +The race can trigger the kernel to induce its job control +mechanism to prevent stuck processes. +I.e. where it sends SIGHUP + SIGCONT to a process group +when it determines that group may become orphaned, +and there are stopped processes in that group. + +* tests/tail/overlay-headers.sh: Use setsid(1) to keep the stopped +tail process in a separate process group, thus avoiding any kernel +job control protection mechanism. +* tests/timeout/timeout.sh: Use setsid(1) to avoid the kernel +checking the main process group when sleep(1) is reparented. +Fixes https://bugs.gnu.org/80477 +--- + tests/tail/overlay-headers.sh | 8 +++++++- + tests/timeout/timeout.sh | 11 ++++++++--- + 2 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/tests/tail/overlay-headers.sh b/tests/tail/overlay-headers.sh +index be9b6a7df..1e6da0a3f 100755 +--- a/tests/tail/overlay-headers.sh ++++ b/tests/tail/overlay-headers.sh +@@ -20,6 +20,8 @@ + . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src + print_ver_ tail sleep + ++setsid true || skip_ 'setsid required to control groups' ++ + # Function to count number of lines from tail + # while ignoring transient errors due to resource limits + countlines_ () +@@ -54,7 +56,11 @@ echo start > file2 || framework_failure_ + env sleep 60 & sleep=$! + + # Note don't use timeout(1) here as it currently +-# does not propagate SIGCONT ++# does not propagate SIGCONT. ++# Note use setsid here to ensure we're in a separate process group ++# as we're going to STOP this tail process, and this can trigger ++# the kernel to send SIGHUP to a group if other tests have ++# processes that are reparented. (See tests/timeout/timeout.sh). + tail $fastpoll --pid=$sleep -f file1 file2 > out & pid=$! + + # Ensure tail is running +diff --git a/tests/timeout/timeout.sh b/tests/timeout/timeout.sh +index 9a395416b..fbb043312 100755 +--- a/tests/timeout/timeout.sh ++++ b/tests/timeout/timeout.sh +@@ -56,9 +56,14 @@ returns_ 124 timeout --foreground -s0 -k1 .1 sleep 10 && fail=1 + ) || fail=1 + + # Don't be confused when starting off with a child (Bug#9098). +-out=$(sleep .1 & exec timeout .5 sh -c 'sleep 2; echo foo') +-status=$? +-test "$out" = "" && test $status = 124 || fail=1 ++# Use setsid to avoid sleep being in the test's process group, as ++# upon reparenting it can trigger an orphaned process group SIGHUP ++# (if there were stopped processes in other tests). ++if setsid true; then ++ out=$(setsid sleep .1 & exec timeout .5 sh -c 'sleep 2; echo foo') ++ status=$? ++ test "$out" = "" && test $status = 124 || fail=1 ++fi + + # Verify --verbose output + cat > exp <<\EOF +-- +2.53.0 +`}, + }, + Flag: TEarly, }, &MakeHelper{ Configure: [][2]string{ |