From 78502174a9cf88cfcdff70f355f30db77ebbd630 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Wed, 17 Sep 2025 14:17:39 +0100 Subject: [PATCH] tests: fix issues with fold-characters.sh test This was noticed with: trap '' PIPE && # Ignore SIGPIPE make check TESTS=tests/fold/fold-characters.sh SUBDIRS=. * tests/fold/fold-characters.sh: Move memory limit test to ... * tests/misc/write-errors.sh: ... which avoids "write error" messages on stderr due to the ignored SIGPIPE. It also protects the fold invocation with a timeout(1) so that fold implementations that don't exit promptly upon write error don't hang the test suite (Like we would have done before commit v9.7-311-gc95c7ee76). --- tests/fold/fold-characters.sh | 6 ------ tests/misc/write-errors.sh | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/fold/fold-characters.sh b/tests/fold/fold-characters.sh index c29b4bdd6d..8be54061bd 100755 --- a/tests/fold/fold-characters.sh +++ b/tests/fold/fold-characters.sh @@ -91,10 +91,4 @@ test $({ bad_unicode | fold; bad_unicode; } | uniq | wc -l) = 1 || fail=1 # Check bad character at EOF test $(env printf '\xC3' | fold | wc -c) = 1 || fail=1 -# Ensure bounded memory operation -vm=$(get_min_ulimit_v_ fold /dev/null) && { - yes | tr -d '\n' | (ulimit -v $(($vm+8000)) && fold 2>err) | head || fail=1 - compare /dev/null err || fail=1 -} - Exit $fail diff --git a/tests/misc/write-errors.sh b/tests/misc/write-errors.sh index 5bc381f5f8..34bed5dfc8 100755 --- a/tests/misc/write-errors.sh +++ b/tests/misc/write-errors.sh @@ -37,6 +37,7 @@ factor --version; yes 1 | factor fold /dev/zero fold -b /dev/zero fold -c /dev/zero +fold --version; yes | tr -d '\\n' | fold head -z -n-1 /dev/zero join -a 1 -z /dev/zero /dev/null # TODO: nl --version; yes | nl -- 2.47.3