internal/rosa/gnu: coreutils 9.10 to 9.11
All checks were successful
Test / Create distribution (push) Successful in 1m15s
Test / Sandbox (push) Successful in 3m31s
Test / ShareFS (push) Successful in 5m13s
Test / Sandbox (race detector) (push) Successful in 6m16s
Test / Hakurei (race detector) (push) Successful in 8m20s
Test / Hakurei (push) Successful in 3m2s
Test / Flake checks (push) Successful in 1m34s
All checks were successful
Test / Create distribution (push) Successful in 1m15s
Test / Sandbox (push) Successful in 3m31s
Test / ShareFS (push) Successful in 5m13s
Test / Sandbox (race detector) (push) Successful in 6m16s
Test / Hakurei (race detector) (push) Successful in 8m20s
Test / Hakurei (push) Successful in 3m2s
Test / Flake checks (push) Successful in 1m34s
Test regression was fixed, dropping patch. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -376,8 +376,8 @@ func init() {
|
|||||||
|
|
||||||
func (t Toolchain) newCoreutils() (pkg.Artifact, string) {
|
func (t Toolchain) newCoreutils() (pkg.Artifact, string) {
|
||||||
const (
|
const (
|
||||||
version = "9.10"
|
version = "9.11"
|
||||||
checksum = "o-B9wssRnZySzJUI1ZJAgw-bZtj1RC67R9po2AcM2OjjS8FQIl16IRHpC6IwO30i"
|
checksum = "t8UMed5wpFEoC56aa42_yidfOAaRGzOfj7MRtQkkqgGbpXiskNA8bd-EmVSQkZie"
|
||||||
)
|
)
|
||||||
return t.NewPackage("coreutils", version, newTar(
|
return t.NewPackage("coreutils", version, newTar(
|
||||||
"https://ftpmirror.gnu.org/gnu/coreutils/coreutils-"+version+".tar.gz",
|
"https://ftpmirror.gnu.org/gnu/coreutils/coreutils-"+version+".tar.gz",
|
||||||
@@ -389,106 +389,13 @@ func (t Toolchain) newCoreutils() (pkg.Artifact, string) {
|
|||||||
test_disable() { chmod +w "$2" && echo "$1" > "$2"; }
|
test_disable() { chmod +w "$2" && echo "$1" > "$2"; }
|
||||||
|
|
||||||
test_disable '#!/bin/sh' gnulib-tests/test-c32ispunct.sh
|
test_disable '#!/bin/sh' gnulib-tests/test-c32ispunct.sh
|
||||||
test_disable '#!/bin/sh' tests/split/line-bytes.sh
|
|
||||||
test_disable '#!/bin/sh' tests/ls/hyperlink.sh
|
test_disable '#!/bin/sh' tests/ls/hyperlink.sh
|
||||||
|
test_disable '#!/bin/sh' tests/misc/user.sh
|
||||||
test_disable 'int main(){return 0;}' gnulib-tests/test-chown.c
|
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-fchownat.c
|
||||||
test_disable 'int main(){return 0;}' gnulib-tests/test-lchown.c
|
test_disable 'int main(){return 0;}' gnulib-tests/test-lchown.c
|
||||||
`,
|
`,
|
||||||
|
|
||||||
Patches: []KV{
|
|
||||||
{"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,
|
Flag: TEarly,
|
||||||
}, &MakeHelper{
|
}, &MakeHelper{
|
||||||
Configure: []KV{
|
Configure: []KV{
|
||||||
|
|||||||
Reference in New Issue
Block a user