diff options
| -rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index ebf3d18843..07b8312a21 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py | |||
| @@ -212,9 +212,12 @@ class Wic(oeSelfTest): | |||
| 212 | @testcase(1212) | 212 | @testcase(1212) |
| 213 | def test_build_artifacts(self): | 213 | def test_build_artifacts(self): |
| 214 | """Test wic create directdisk providing all artifacts.""" | 214 | """Test wic create directdisk providing all artifacts.""" |
| 215 | bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) | 215 | variables = (('STAGING_DATADIR', 'wic-tools'), |
| 216 | for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 'IMAGE_ROOTFS')) | 216 | ('RECIPE_SYSROOT_NATIVE', 'wic-tools'), |
| 217 | bbvars['recipe_sysroot_native'] = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') | 217 | ('DEPLOY_DIR_IMAGE', 'core-image-minimal'), |
| 218 | ('IMAGE_ROOTFS', 'core-image-minimal')) | ||
| 219 | bbvars = {var.lower(): get_bb_var(var, recipe) \ | ||
| 220 | for var, recipe in variables} | ||
| 218 | bbvars['resultdir'] = self.resultdir | 221 | bbvars['resultdir'] = self.resultdir |
| 219 | status = runCmd("wic create directdisk " | 222 | status = runCmd("wic create directdisk " |
| 220 | "-b %(staging_datadir)s " | 223 | "-b %(staging_datadir)s " |
| @@ -318,9 +321,12 @@ class Wic(oeSelfTest): | |||
| 318 | @testcase(1269) | 321 | @testcase(1269) |
| 319 | def test_rootfs_artifacts(self): | 322 | def test_rootfs_artifacts(self): |
| 320 | """Test usage of rootfs plugin with rootfs paths""" | 323 | """Test usage of rootfs plugin with rootfs paths""" |
| 321 | bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) | 324 | variables = (('STAGING_DATADIR', 'wic-tools'), |
| 322 | for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 'IMAGE_ROOTFS')) | 325 | ('RECIPE_SYSROOT_NATIVE', 'wic-tools'), |
| 323 | bbvars['recipe_sysroot_native'] = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') | 326 | ('DEPLOY_DIR_IMAGE', 'core-image-minimal'), |
| 327 | ('IMAGE_ROOTFS', 'core-image-minimal')) | ||
| 328 | bbvars = {var.lower(): get_bb_var(var, recipe) \ | ||
| 329 | for var, recipe in variables} | ||
| 324 | bbvars['wks'] = "directdisk-multi-rootfs" | 330 | bbvars['wks'] = "directdisk-multi-rootfs" |
| 325 | bbvars['resultdir'] = self.resultdir | 331 | bbvars['resultdir'] = self.resultdir |
| 326 | status = runCmd("wic create %(wks)s " | 332 | status = runCmd("wic create %(wks)s " |