From 7c16c21bc29a841c58621ee0ef3f4d81083ef0e0 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 19 Mar 2019 17:30:05 +0100 Subject: Fix in oe-selftests/qemu_launch Should build `imagename` and not 'core-image-minimal' in all cases Signed-off-by: Laurent Bonnans --- lib/oeqa/selftest/cases/testutils.py | 11 +++++------ lib/oeqa/selftest/cases/updater_qemux86_64.py | 14 -------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/lib/oeqa/selftest/cases/testutils.py b/lib/oeqa/selftest/cases/testutils.py index 77bcad7..d381d7d 100644 --- a/lib/oeqa/selftest/cases/testutils.py +++ b/lib/oeqa/selftest/cases/testutils.py @@ -10,14 +10,13 @@ from qemucommand import QemuCommand def qemu_launch(efi=False, machine=None, imagename=None): logger = logging.getLogger("selftest") - logger.info('Running bitbake to build core-image-minimal') - bitbake('core-image-minimal') + if imagename is None: + imagename = 'core-image-minimal' + logger.info('Running bitbake to build {}'.format(imagename)) + bitbake(imagename) # Create empty object. args = type('', (), {})() - if imagename: - args.imagename = imagename - else: - args.imagename = 'core-image-minimal' + args.imagename = imagename args.mac = None # Could use DEPLOY_DIR_IMAGE here but it's already in the machine # subdirectory. diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py index 814e139..95ae208 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py @@ -354,13 +354,6 @@ class HsmTests(OESelftestTestCase): class SecondaryTests(OESelftestTestCase): - @classmethod - def setUpClass(cls): - super(SecondaryTests, cls).setUpClass() - logger = logging.getLogger("selftest") - logger.info('Running bitbake to build secondary-image') - bitbake('secondary-image') - def setUpLocal(self): layer = "meta-updater-qemux86-64" result = runCmd('bitbake-layers show-layers') @@ -399,13 +392,6 @@ class SecondaryTests(OESelftestTestCase): class PrimaryTests(OESelftestTestCase): - @classmethod - def setUpClass(cls): - super(PrimaryTests, cls).setUpClass() - logger = logging.getLogger("selftest") - logger.info('Running bitbake to build primary-image') - bitbake('primary-image') - def setUpLocal(self): layer = "meta-updater-qemux86-64" result = runCmd('bitbake-layers show-layers') -- cgit v1.2.3-54-g00ecf