[OE-core] [PATCH][v2] e2fsprogs: fix the ptest

[rongqing.li at windriver.com]

From: Roy Li <rongqing.li at windriver.com>

1. a hard-coded path in ptest is used, fix it.
2. fix the m_bigjournal ptest failure by resetting cache goal properly
3. fix the removal test.log error by adding the correct path before
test.log

Signed-off-by: Roy Li <rongqing.li at windriver.com>
---
 .../e2fsprogs/e2fsprogs/0001-reset-last_goal.patch | 51 ++++++++++++++++++++++
 .../recipes-devtools/e2fsprogs/e2fsprogs/run-ptest |  2 +-
 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb |  2 +
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-reset-last_goal.patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-reset-last_goal.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-reset-last_goal.patch
new file mode 100644
index 0000000..864e01e
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-reset-last_goal.patch
@@ -0,0 +1,51 @@
+reset last_goal when ext2fs_extent_node_split is called.
+
+Upstream-Status: Inappropriate
+
+cache_inode.patch speeds up the making ext* filesystem, but it leads
+to the m_bigjournal ptest failure; In fact, when ext2fs_extent_node_split 
+is called, the cache goal should be reset
+
+the patch fixes the m_bigjournal ptest failure, and does not lost the
+speed.
+
+Signed-off-by: Roy Li <rongqing.li at windriver.com>
+---
+ lib/ext2fs/alloc.c  | 2 +-
+ lib/ext2fs/extent.c | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/ext2fs/alloc.c b/lib/ext2fs/alloc.c
+index 830fc22..5bab9db 100644
+--- a/lib/ext2fs/alloc.c
++++ b/lib/ext2fs/alloc.c
+@@ -160,7 +160,7 @@ errcode_t ext2fs_new_inode(ext2_filsys fs, ext2_ino_t dir,
+ 	return 0;
+ }
+ 
+-static blk64_t last_goal = 0;
++blk64_t last_goal = 0;
+ 
+ /*
+  * Stupid algorithm --- we now just search forward starting from the
+diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c
+index 5cdc2e4..044a17a 100644
+--- a/lib/ext2fs/extent.c
++++ b/lib/ext2fs/extent.c
+@@ -819,6 +819,8 @@ errcode_t ext2fs_extent_replace(ext2_extent_handle_t handle,
+  *
+  * handle will be left pointing at original record.
+  */
++extern blk64_t last_goal;
++
+ errcode_t ext2fs_extent_node_split(ext2_extent_handle_t handle)
+ {
+ 	errcode_t			retval = 0;
+@@ -936,6 +938,7 @@ errcode_t ext2fs_extent_node_split(ext2_extent_handle_t handle)
+ 			group = group & ~((1 << (log_flex)) - 1);
+ 		goal_blk = ext2fs_group_first_block2(handle->fs, group);
+ 	}
++	last_goal = goal_blk;
+ 	retval = ext2fs_alloc_block2(handle->fs, goal_blk, block_buf,
+ 				    &new_node_pblk);
+ 	if (retval)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
index 1ac2513..e02fc7f 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
@@ -5,7 +5,7 @@ cd ./test
 if [ $? -eq 0 ]
 then
 	echo "PASS: e2fsprogs"
-	rm test.log
+	rm ../test.log
 else
 	echo "FAIL: e2fsprogs"
 fi
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index ce7d2e8..c021306 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -24,6 +24,7 @@ SRC_URI += "file://acinclude.m4 \
             file://CVE-2015-0247.patch \
             file://0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch \
             file://copy-in-create-hardlinks-with-the-correct-directory-.patch \
+            file://0001-reset-last_goal.patch \
 "
 
 SRC_URI[md5sum] = "3f8e41e63b432ba114b33f58674563f7"
@@ -114,4 +115,5 @@ do_install_ptest() {
 	cp -a ${B}/tests ${D}${PTEST_PATH}/test
 	cp -a ${S}/tests/* ${D}${PTEST_PATH}/test
 	sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect*
+	sed -e 's!/usr/lib/e2fsprogs/ptest!${PTEST_PATH}!g' -i ${D}${PTEST_PATH}/test/test_*
 }
-- 
1.9.1