mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

selftest: wic: use wic-tools recipe to get STAGING_DIR

Browse Source 
STAGING_DIR variable is used to get path to a boot dir.
It's better to use wic-tools recipe to it as it contains
all bootloader artifacts.

Modified test_build_artifacts and test_rootfs_artifacts to
use wic-tools target to get STAGING_DIR.

(From OE-Core rev: eb648ac5566fbcc679e8544fd8403a730ce71058)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2017-02-03 16:58:15 +02:00
committed by Richard Purdie
parent f9b58d0d11
commit 23237b46dc
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
meta/lib/oeqa/selftest/wic.py
View File

@@ -212,9 +212,12 @@ class Wic(oeSelfTest):
@testcase(1212)
def test_build_artifacts(self):
"""Test wic create directdisk providing all artifacts."""
bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal'))
for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 'IMAGE_ROOTFS'))
bbvars['recipe_sysroot_native'] = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
variables = (('STAGING_DATADIR', 'wic-tools'),
('RECIPE_SYSROOT_NATIVE', 'wic-tools'),
('DEPLOY_DIR_IMAGE', 'core-image-minimal'),
('IMAGE_ROOTFS', 'core-image-minimal'))
bbvars = {var.lower(): get_bb_var(var, recipe) \
for var, recipe in variables}
bbvars['resultdir'] = self.resultdir
status = runCmd("wic create directdisk "
"-b %(staging_datadir)s "
@@ -318,9 +321,12 @@ class Wic(oeSelfTest):
@testcase(1269)
def test_rootfs_artifacts(self):
"""Test usage of rootfs plugin with rootfs paths"""
bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal'))
for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 'IMAGE_ROOTFS'))
bbvars['recipe_sysroot_native'] = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
variables = (('STAGING_DATADIR', 'wic-tools'),
('RECIPE_SYSROOT_NATIVE', 'wic-tools'),
('DEPLOY_DIR_IMAGE', 'core-image-minimal'),
('IMAGE_ROOTFS', 'core-image-minimal'))
bbvars = {var.lower(): get_bb_var(var, recipe) \
for var, recipe in variables}
bbvars['wks'] = "directdisk-multi-rootfs"
bbvars['resultdir'] = self.resultdir
status = runCmd("wic create %(wks)s "