mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 09:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

coreutils: Fix intermittent ptest issue

Browse Source 
The test writes to the disk and means the space used changes. If this
crosses a number boundary, the heading spacing can change causing a test
failure. This was triggered by a recent gcc upgrade.

Add a fix for this which has been shared with upstream.

(From OE-Core rev: ca6f0d81fc7d5e53d216e5131724e826369fd4ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2024-08-08 10:37:58 +01:00
parent 51192a79f1
commit dc3e34b3a6
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch Normal file
View File

@@ -0,0 +1,29 @@
tests/df: Fix intermittent test failure
The test writes to the disk and means the space used changes. If this
crosses a number boundary, the heading spacing can change:
-Filesystem 1024-blocks Used Available Capacity Mounted on
+Filesystem 1024-blocks Used Available Capacity Mounted on
The test is to make sure the 1024 blocks element remains the same and
the spacing doesn't matter. Therefore strip any duplicate spaces using tr.
Upstream-Status: Submitted [https://github.com/coreutils/coreutils/pull/88]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Index: coreutils-9.5/tests/df/df-P.sh
===================================================================
--- coreutils-9.5.orig/tests/df/df-P.sh
+++ coreutils-9.5/tests/df/df-P.sh
@@ -20,8 +20,8 @@
print_ver_ df
- df -P . > t1 || fail=1
-BLOCK_SIZE=1M df -P . > t2 || fail=1
+ df -P . | tr -s ' ' > t1 || fail=1
+BLOCK_SIZE=1M df -P . | tr -s ' ' > t2 || fail=1
# Since file system utilization may be changing, compare only df's header line.
# That records the block size. E.g., for "1M", it would be:

1
meta/recipes-core/coreutils/coreutils_9.5.bb
View File

@@ -16,6 +16,7 @@ inherit autotools gettext texinfo
SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
file://remove-usr-local-lib-from-m4.patch \
file://0001-local.mk-fix-cross-compiling-problem.patch \
file://intermittent-testfailure.patch \
file://run-ptest \
"
SRC_URI[sha256sum] = "cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a"