From: Paul Barker Date: Mon, 5 Jan 2026 13:05:31 +0000 (+0000) Subject: util-linux: Disable flaky script/options-size test X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7a698d81b7435143525e7ef408c322b11937596;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git util-linux: Disable flaky script/options-size test The test case for the --output-limit / -o option to `script` is flaky due to the way the output limit is handled. Depending on how buffer boundaries line up, the command may output different numbers of characters, but the test case expects the output to always be identical. This has been raised upstream [1], as there are multiple options for fixing this - we can change the behaviour of script, or we can relax the test case. Changing the behaviour of script may impact users so we don't want to rush ahead and do that. For now, we're going to disable the test case. [1]: https://msgid.link/978c83bdf7596879458f39f1789da016150a72d4.camel@pbarker.dev Fixes [YOCTO #15188] Signed-off-by: Paul Barker Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 7280d48787..deb9bfd064 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -19,6 +19,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch \ file://0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch \ file://0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch \ + file://0001-tests-script-Disable-size-option-test.patch \ " SRC_URI[sha256sum] = "3330d873f0fceb5560b89a7dc14e4f3288bbd880e96903ed9b50ec2b5799e58b" diff --git a/meta/recipes-core/util-linux/util-linux/0001-tests-script-Disable-size-option-test.patch b/meta/recipes-core/util-linux/util-linux/0001-tests-script-Disable-size-option-test.patch new file mode 100644 index 0000000000..4181f5b5ae --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-tests-script-Disable-size-option-test.patch @@ -0,0 +1,43 @@ +From 1d38887185c0424a82bcf05efbd8585df1bba8cf Mon Sep 17 00:00:00 2001 +From: Paul Barker +Date: Mon, 5 Jan 2026 09:56:41 +0000 +Subject: [PATCH] tests: script: Disable size option test + +The test case for the --output-limit / -o option to `script` is flaky +due to the way the output limit is handled. Depending on how buffer +boundaries line up, the command may output different numbers of +characters, but the test case expects the output to always be identical. + +This has been raised upstream [1], as there are multiple options for +fixing this - we can change the behaviour of script, or we can relax the +test case. Changing the behaviour of script may impact users so we don't +want to rush ahead and do that. + +For now, we're going to disable the test case. + +[1]: https://msgid.link/978c83bdf7596879458f39f1789da016150a72d4.camel@pbarker.dev + +Upstream-Status: Inappropriate [see above] +Signed-off-by: Paul Barker +--- + tests/ts/script/options | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/tests/ts/script/options b/tests/ts/script/options +index 3cbd5c8ab463..4da51cd83c66 100755 +--- a/tests/ts/script/options ++++ b/tests/ts/script/options +@@ -57,10 +57,4 @@ $TS_HELPER_SCRIPT --return --append -c "exit 127" $TS_OUTPUT /dev/nu + echo $? >> $TS_OUTPUT + ts_finalize_subtest + +-ts_init_subtest "size" +-$TS_HELPER_SCRIPT --output-limit 9 --command "echo 1:1234567890" $TS_OUTPUT /dev/null 2>&1 +-$TS_HELPER_SCRIPT -a -o 9 --command "echo 2:1234567890" $TS_OUTPUT /dev/null 2>&1 +-echo $? >> $TS_OUTPUT +-ts_finalize_subtest +- + ts_finalize +-- +2.43.0 +