]> code.ossystems Code Review - openembedded-core.git/commitdiff
e2fsprogs: fix the hardcoded paths for ptest
authorJackie Huang <jackie.huang@windriver.com>
Fri, 2 Feb 2018 07:10:34 +0000 (15:10 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 6 Feb 2018 10:54:42 +0000 (10:54 +0000)
Fix the hardcoded paths in test scripts and expect
files to avoid issue like:
| cat: ../e2fsck/e2fsck: No such file or directory

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb

index a53585db47019acd62ec6a448190252b44e7b686..ceaf1715854af9b996fba42f55b807fbc0f3358e 100644 (file)
@@ -104,7 +104,9 @@ do_compile_ptest() {
 do_install_ptest() {
        cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test
        cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test
-       sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect*
+       sed -e 's!../e2fsck/e2fsck!e2fsck!g' \
+           -e 's!../misc/tune2fs!tune2fs!g' -i ${D}${PTEST_PATH}/test/*/expect*
+       sed -e 's!../e2fsck/e2fsck!${base_sbindir}/e2fsck!g' -i ${D}${PTEST_PATH}/test/*/script
 
        # Remove various files
        find "${D}${PTEST_PATH}" -type f \