summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2018-02-02 15:10:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:30 +0000
commit110f56dfa5acf8424ed8b9cff73d36a1b92f6bbb (patch)
tree66d2a0722116d87099cf9455ec30e14d674ef52c
parentaa81e94f801ea737f192dea6530d3dabf9ab6040 (diff)
downloadpoky-110f56dfa5acf8424ed8b9cff73d36a1b92f6bbb.tar.gz
e2fsprogs: fix the hardcoded paths for ptest
Fix the hardcoded paths in test scripts and expect files to avoid issue like: | cat: ../e2fsck/e2fsck: No such file or directory (From OE-Core rev: 4a4eff9b9e3c614ff41b17cbec359b72dcbd41bd) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
index a53585db47..ceaf171585 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
@@ -104,7 +104,9 @@ do_compile_ptest() {
104do_install_ptest() { 104do_install_ptest() {
105 cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test 105 cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test
106 cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test 106 cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test
107 sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect* 107 sed -e 's!../e2fsck/e2fsck!e2fsck!g' \
108 -e 's!../misc/tune2fs!tune2fs!g' -i ${D}${PTEST_PATH}/test/*/expect*
109 sed -e 's!../e2fsck/e2fsck!${base_sbindir}/e2fsck!g' -i ${D}${PTEST_PATH}/test/*/script
108 110
109 # Remove various files 111 # Remove various files
110 find "${D}${PTEST_PATH}" -type f \ 112 find "${D}${PTEST_PATH}" -type f \