From: Robert Yang <liezhi.yang@windriver.com>
Date: Sat, 9 Nov 2013 07:21:41 +0000 (-0500)
Subject: e2fsprogs: fix tests/f_extent_oobounds
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~35469
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22465cef87b4b1685b3b131751eaf528503b264c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

e2fsprogs: fix tests/f_extent_oobounds

tests/f_extent_oobounds runs debugfs from the system, not from the
source tree, and if the system's debugfs doesn't have the extent_open
command it fails silently.

Use $DEBUGFS and $MKE2FS to get the in-tree executables for this test,
just like other test scripts do.

(Build machines which run make check shouldn't need to have e2fsprogs
installed, and we should be testing just-built versions of the tools
anyway)

This patch is from:
http://www.spinics.net/lists/linux-ext4/msg38880.html

Eric Sandeen had sent it to the linux-ext4 mailing list, but haven't
been merge by now.

[YOCTO #5511]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/e2fsprogs-fix-tests-f_extent_oobounds.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/e2fsprogs-fix-tests-f_extent_oobounds.patch
new file mode 100644
index 00000000000..a4f70776417
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/e2fsprogs-fix-tests-f_extent_oobounds.patch
@@ -0,0 +1,43 @@
+From 1bfd0e015be7dd22a44995dd2a7002328aedc0e6 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Sat, 9 Nov 2013 22:24:37 +0800
+Subject: [PATCH] e2fsprogs: fix tests/f_extent_oobounds
+
+Use $DEBUGFS and $MKE2FS to get the in-tree executables
+for this test.
+
+(Build machines which run make check shouldn't need to have
+e2fsprogs installed, and we should be testing just-built versions
+of the tools anyway)
+
+This patch is from:
+http://www.spinics.net/lists/linux-ext4/msg38880.html
+
+Eric Sandeen had sent it to the upstream, but haven't been merge by now.
+
+Upstream-Status: Backport
+
+Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ tests/f_extent_oobounds/script | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/f_extent_oobounds/script b/tests/f_extent_oobounds/script
+index 31ac6c9..b00b031 100644
+--- a/tests/f_extent_oobounds/script
++++ b/tests/f_extent_oobounds/script
+@@ -4,8 +4,8 @@ SKIP_GUNZIP="true"
+ TEST_DATA="$test_name.tmp"
+ 
+ dd if=/dev/zero of=$TMPFILE bs=1k count=256 > /dev/null 2>&1
+-mke2fs -Ft ext4 $TMPFILE > /dev/null 2>&1
+-debugfs -w $TMPFILE << EOF  > /dev/null 2>&1
++$MKE2FS -Ft ext4 $TMPFILE > /dev/null 2>&1
++$DEBUGFS -w $TMPFILE << EOF  > /dev/null 2>&1
+ write /dev/null testfile
+ extent_open testfile
+   insert_node 0 15 100
+-- 
+1.8.3.1
+
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
index 154b864c122..22ad925fe2f 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
@@ -8,6 +8,7 @@ SRC_URI += "file://acinclude.m4 \
             file://fix-icache.patch \
             file://debugfs-extent-header.patch \
             file://populate-extfs.sh \
+            file://e2fsprogs-fix-tests-f_extent_oobounds.patch \
 "
 
 SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"