mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-05 05:04:44 +02:00
wic-image-minimal, oeqa/selftest/wic: run 'wic ls/cp/rm' in bitbake task
Due to commit [2255f28b57 wic: add WIC_SECTOR_SIZE variable][1] applied, call `wic ls|cp|rm|write' in bitbake task will hung, but we have no scenario case to cover it After commit [scripts/wic: fix calling wic ls|cp|rm|write hung in bitbake task] applied, this commit run `wic cp|ls|rm' in case wic.Wic2.test_wic_image_type and wic.Wic2.test_qemu, at post function of with do_image_wic in image wic-image-minimal, and check if file is there $ echo 'SANITY_TESTED_DISTROS = ""' >> conf/local.conf $ oe-selftest -r wic.Wic2.test_wic_image_type wic.Wic2.test_qemu ... 2025-06-23 15:46:22,157 - oe-selftest - INFO - Adding: "include selftest.inc" in /buildarea5/hjia/poky/build-st/conf/local.conf 2025-06-23 15:46:22,157 - oe-selftest - INFO - Adding: "include bblayers.inc" in bblayers.conf 2025-06-23 15:46:22,157 - oe-selftest - INFO - test_qemu (wic.Wic2) The variable 'TEST_RUNQEMUPARAMS' is not defined 2025-06-23 15:56:46,319 - oe-selftest - INFO - ... ok 2025-06-23 15:56:46,324 - oe-selftest - INFO - test_wic_image_type (wic.Wic2) 2025-06-23 15:57:17,780 - oe-selftest - INFO - ... ok 2025-06-23 15:57:17,781 - oe-selftest - INFO - ---------------------------------------------------------------------- 2025-06-23 15:57:17,781 - oe-selftest - INFO - Ran 2 tests in 655.792s 2025-06-23 15:57:17,781 - oe-selftest - INFO - OK 2025-06-23 15:57:25,743 - oe-selftest - INFO - RESULTS: 2025-06-23 15:57:25,743 - oe-selftest - INFO - RESULTS - wic.Wic2.test_qemu: PASSED (624.16s) 2025-06-23 15:57:25,744 - oe-selftest - INFO - RESULTS - wic.Wic2.test_wic_image_type: PASSED (31.46s) 2025-06-23 15:57:25,746 - oe-selftest - INFO - SUMMARY: 2025-06-23 15:57:25,746 - oe-selftest - INFO - oe-selftest () - Ran 2 tests in 655.793s 2025-06-23 15:57:25,746 - oe-selftest - INFO - oe-selftest - OK - All required tests passed (successes=2, skipped=0, failures=0, errors=0) (From OE-Core rev: 18d774eafb7fba720882fcdb945d145b82fa1dd4) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e2e709d85e
commit
2768d6f676
|
@ -16,3 +16,5 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
|
||||||
IMAGE_ROOTFS_EXTRA_SPACE = "2000"
|
IMAGE_ROOTFS_EXTRA_SPACE = "2000"
|
||||||
|
|
||||||
inherit image
|
inherit image
|
||||||
|
|
||||||
|
include test_recipe.inc
|
||||||
|
|
|
@ -1021,6 +1021,18 @@ class Wic2(WicTestCase):
|
||||||
"""Test building wic images by bitbake"""
|
"""Test building wic images by bitbake"""
|
||||||
config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\
|
config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\
|
||||||
'MACHINE_FEATURES:append = " efi"\n'
|
'MACHINE_FEATURES:append = " efi"\n'
|
||||||
|
image_recipe_append = """
|
||||||
|
do_image_wic[postfuncs] += "run_wic_cmd"
|
||||||
|
run_wic_cmd() {
|
||||||
|
echo "test" >> ${WORKDIR}/test.wic-cp
|
||||||
|
wic cp --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" ${WORKDIR}/test.wic-cp ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic:1/
|
||||||
|
wic ls --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic:1/
|
||||||
|
wic rm --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic:1/test.wic-cp
|
||||||
|
wic cp --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" ${WORKDIR}/test.wic-cp ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic:1/
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
self.write_recipeinc('images', image_recipe_append)
|
||||||
|
|
||||||
self.append_config(config)
|
self.append_config(config)
|
||||||
image = 'wic-image-minimal'
|
image = 'wic-image-minimal'
|
||||||
bitbake(image)
|
bitbake(image)
|
||||||
|
@ -1029,6 +1041,11 @@ class Wic2(WicTestCase):
|
||||||
bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image)
|
bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image)
|
||||||
prefix = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], '%s.' % bb_vars['IMAGE_LINK_NAME'])
|
prefix = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], '%s.' % bb_vars['IMAGE_LINK_NAME'])
|
||||||
|
|
||||||
|
sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
|
||||||
|
# check if file is there
|
||||||
|
result = runCmd("wic ls %s:1/ -n %s" % (prefix+"wic", sysroot))
|
||||||
|
self.assertIn("test.wic-cp", result.output)
|
||||||
|
|
||||||
# check if we have result image and manifests symlinks
|
# check if we have result image and manifests symlinks
|
||||||
# pointing to existing files
|
# pointing to existing files
|
||||||
for suffix in ('wic', 'manifest'):
|
for suffix in ('wic', 'manifest'):
|
||||||
|
@ -1044,7 +1061,25 @@ class Wic2(WicTestCase):
|
||||||
config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\
|
config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\
|
||||||
'MACHINE_FEATURES:append = " efi"\n'
|
'MACHINE_FEATURES:append = " efi"\n'
|
||||||
self.append_config(config)
|
self.append_config(config)
|
||||||
|
image_recipe_append = """
|
||||||
|
do_image_wic[postfuncs] += "run_wic_cmd"
|
||||||
|
run_wic_cmd() {
|
||||||
|
echo "test" >> ${WORKDIR}/test.wic-cp
|
||||||
|
wic cp --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" ${WORKDIR}/test.wic-cp ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic:1/
|
||||||
|
wic ls --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic:1/
|
||||||
|
wic rm --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic:1/test.wic-cp
|
||||||
|
wic cp --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" ${WORKDIR}/test.wic-cp ${IMGDEPLOYDIR}/${IMAGE_NAME}.wic:1/
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
self.write_recipeinc('images', image_recipe_append)
|
||||||
bitbake('wic-image-minimal')
|
bitbake('wic-image-minimal')
|
||||||
|
|
||||||
|
sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
|
||||||
|
bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], "wic-image-minimal")
|
||||||
|
image_path = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], bb_vars['IMAGE_LINK_NAME'])
|
||||||
|
# check if file is there
|
||||||
|
result = runCmd("wic ls %s:1/ -n %s" % (image_path+".wic", sysroot))
|
||||||
|
self.assertIn("test.wic-cp", result.output)
|
||||||
self.remove_config(config)
|
self.remove_config(config)
|
||||||
|
|
||||||
runqemu_params = get_bb_var('TEST_RUNQEMUPARAMS', 'wic-image-minimal') or ""
|
runqemu_params = get_bb_var('TEST_RUNQEMUPARAMS', 'wic-image-minimal') or ""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user