sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

busybox: fix du-k-works test case 

[YOCTO #2896]

The du-k-works test seems to assume that du -k on a directory with two files
totaling 80 kilobytes should report either 80k or 88k. In ext4 filesystm however,
both busybox' du -k and coreutils' du -k reports a size of 84k which causes the
test to fail.

Intergrate the patch from:
http://git.busybox.net/busybox/commit/?id=a5ee090e8651692545514a81a16c6cde3a2dc577

(From OE-Core rev: a022fb6b69388f28f3130e71125b64e4c154d504)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Roy.Li 2012-08-06 10:50:01 +08:00 committed by Richard Purdie
parent c8815d2f21
commit ba218e743b
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
meta/recipes-core/busybox/busybox-1.19.4/fix-for-spurious-testsuite-failure.patch Normal file
View File

@ -0,0 +1,27 @@
Backport the patch from:
http://git.busybox.net/busybox/commit/?id=a5ee090e8651692545514a81a16c6cde3a2dc577
From a5ee090e8651692545514a81a16c6cde3a2dc577 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 10 May 2012 19:26:37 +0200
Subject: [PATCH] fix for spurious testsuite failure
Upstream-Status: Backport
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
testsuite/du/du-k-works | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/testsuite/du/du-k-works b/testsuite/du/du-k-works
index 229a948..36dcaa8 100644
--- a/testsuite/du/du-k-works
+++ b/testsuite/du/du-k-works
@@ -3,4 +3,5 @@ cd du.testdir
dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null
dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null
test x"`busybox du -k .`" = x"80 ." \
+ -o x"`busybox du -k .`" = x"84 ." \
-o x"`busybox du -k .`" = x"88 ."
--
1.7.4.1

5
meta/recipes-core/busybox/busybox_1.19.4.bb
View File

@ -1,5 +1,5 @@
require busybox.inc
PR = "r12"
PR = "r13"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://B921600.patch \
@ -24,7 +24,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://mdev.conf \
file://umount.busybox \
file://defconfig \
file://busybox-mkfs-minix-tests_bigendian.patch"
file://busybox-mkfs-minix-tests_bigendian.patch \
file://fix-for-spurious-testsuite-failure.patch"
SRC_URI[tarball.md5sum] = "9c0cae5a0379228e7b55e5b29528df8e"
SRC_URI[tarball.sha256sum] = "9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee"