1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00

oe-selftest: wic: Fix testcase

Fixed test05_build_artifacts testcase by using values of MACHINE
and BUILD_SYS bitbake variables in paths to artifacts.

Test was failing because of hardcoded machine(qemux86) and
build_sys(qemux86-poky-linux) in artifact paths.

[YOCTO #7730]

(From OE-Core rev: dda85cd420d47d97b0d0b0f294b37cd6066c541c)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2015-06-16 09:43:17 +03:00
committed by Richard Purdie
parent 2173a0ec28
commit 410e272591
+10 -7
View File
@@ -29,7 +29,7 @@ from glob import glob
from shutil import rmtree from shutil import rmtree
from oeqa.selftest.base import oeSelfTest from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd, bitbake from oeqa.utils.commands import runCmd, bitbake, get_bb_var
class Wic(oeSelfTest): class Wic(oeSelfTest):
"""Wic test class.""" """Wic test class."""
@@ -66,12 +66,15 @@ class Wic(oeSelfTest):
def test05_build_artifacts(self): def test05_build_artifacts(self):
"""Test wic create directdisk providing all artifacts.""" """Test wic create directdisk providing all artifacts."""
self.assertEqual(0, runCmd("wic create directdisk " vars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) \
"-b tmp/sysroots/qemux86/usr/share " for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE',
"-k tmp/deploy/images/qemux86 " 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS'))
"-n tmp/sysroots/x86_64-linux " status = runCmd("wic create directdisk "
"-r tmp/work/qemux86-poky-linux/" "-b %(staging_datadir)s "
"core-image-minimal/1.0-r0/rootfs").status) "-k %(deploy_dir_image)s "
"-n %(staging_dir_native)s "
"-r %(image_rootfs)s" % vars).status
self.assertEqual(0, status)
self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
def test06_gpt_image(self): def test06_gpt_image(self):