summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLaurent Bonnans <laurent.bonnans@here.com>2019-03-19 17:30:05 +0100
committerLaurent Bonnans <laurent.bonnans@here.com>2019-03-20 14:13:41 +0100
commita6246aa4839d58209a81d5215c87c0afbe762ecd (patch)
treed5648f983c9b01247714688597dd02daead9552b /lib
parent8b98e1e0f908ef30f5a4459f2bd62442d2b6649b (diff)
downloadmeta-updater-a6246aa4839d58209a81d5215c87c0afbe762ecd.tar.gz
Fix in oe-selftests/qemu_launch
Should build `imagename` and not 'core-image-minimal' in all cases Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/oeqa/selftest/cases/testutils.py11
-rw-r--r--lib/oeqa/selftest/cases/updater_qemux86_64.py14
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
10 10
11def qemu_launch(efi=False, machine=None, imagename=None): 11def qemu_launch(efi=False, machine=None, imagename=None):
12 logger = logging.getLogger("selftest") 12 logger = logging.getLogger("selftest")
13 logger.info('Running bitbake to build core-image-minimal') 13 if imagename is None:
14 bitbake('core-image-minimal') 14 imagename = 'core-image-minimal'
15 logger.info('Running bitbake to build {}'.format(imagename))
16 bitbake(imagename)
15 # Create empty object. 17 # Create empty object.
16 args = type('', (), {})() 18 args = type('', (), {})()
17 if imagename: 19 args.imagename = imagename
18 args.imagename = imagename
19 else:
20 args.imagename = 'core-image-minimal'
21 args.mac = None 20 args.mac = None
22 # Could use DEPLOY_DIR_IMAGE here but it's already in the machine 21 # Could use DEPLOY_DIR_IMAGE here but it's already in the machine
23 # subdirectory. 22 # subdirectory.
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py
index 9310841..08afbe6 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):
354 354
355 355
356class SecondaryTests(OESelftestTestCase): 356class SecondaryTests(OESelftestTestCase):
357 @classmethod
358 def setUpClass(cls):
359 super(SecondaryTests, cls).setUpClass()
360 logger = logging.getLogger("selftest")
361 logger.info('Running bitbake to build secondary-image')
362 bitbake('secondary-image')
363
364 def setUpLocal(self): 357 def setUpLocal(self):
365 layer = "meta-updater-qemux86-64" 358 layer = "meta-updater-qemux86-64"
366 result = runCmd('bitbake-layers show-layers') 359 result = runCmd('bitbake-layers show-layers')
@@ -399,13 +392,6 @@ class SecondaryTests(OESelftestTestCase):
399 392
400 393
401class PrimaryTests(OESelftestTestCase): 394class PrimaryTests(OESelftestTestCase):
402 @classmethod
403 def setUpClass(cls):
404 super(PrimaryTests, cls).setUpClass()
405 logger = logging.getLogger("selftest")
406 logger.info('Running bitbake to build primary-image')
407 bitbake('primary-image')
408
409 def setUpLocal(self): 395 def setUpLocal(self):
410 layer = "meta-updater-qemux86-64" 396 layer = "meta-updater-qemux86-64"
411 result = runCmd('bitbake-layers show-layers') 397 result = runCmd('bitbake-layers show-layers')