diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/runqemu.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runqemu.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index af45c048a4..e1093c67c7 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py | |||
@@ -13,6 +13,7 @@ from oeqa.core.decorator.data import skipIfNotArch, skipIfNotMachine | |||
13 | from oeqa.selftest.case import OESelftestTestCase | 13 | from oeqa.selftest.case import OESelftestTestCase |
14 | from oeqa.utils.commands import bitbake, runqemu, get_bb_var | 14 | from oeqa.utils.commands import bitbake, runqemu, get_bb_var |
15 | 15 | ||
16 | |||
16 | @OETestTag("runqemu") | 17 | @OETestTag("runqemu") |
17 | class RunqemuTests(OESelftestTestCase): | 18 | class RunqemuTests(OESelftestTestCase): |
18 | """Runqemu test class""" | 19 | """Runqemu test class""" |
@@ -23,8 +24,8 @@ class RunqemuTests(OESelftestTestCase): | |||
23 | def setUpLocal(self): | 24 | def setUpLocal(self): |
24 | super(RunqemuTests, self).setUpLocal() | 25 | super(RunqemuTests, self).setUpLocal() |
25 | self.recipe = 'core-image-minimal' | 26 | self.recipe = 'core-image-minimal' |
26 | self.machine = self.td['MACHINE'] | 27 | self.machine = self.td['MACHINE'] |
27 | self.image_link_name = get_bb_var('IMAGE_LINK_NAME', self.recipe) | 28 | self.image_link_name = get_bb_var('IMAGE_LINK_NAME', self.recipe) |
28 | 29 | ||
29 | self.fstypes = "ext4" | 30 | self.fstypes = "ext4" |
30 | if self.td["HOST_ARCH"] in ('i586', 'i686', 'x86_64'): | 31 | if self.td["HOST_ARCH"] in ('i586', 'i686', 'x86_64'): |
@@ -102,7 +103,6 @@ SYSLINUX_TIMEOUT = "10" | |||
102 | with open(qemu.qemurunnerlog) as f: | 103 | with open(qemu.qemurunnerlog) as f: |
103 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) | 104 | self.assertTrue(qemu.runner.logged, "Failed: %s, %s" % (cmd, f.read())) |
104 | 105 | ||
105 | |||
106 | @skipIfNotArch(['i586', 'i686', 'x86_64']) | 106 | @skipIfNotArch(['i586', 'i686', 'x86_64']) |
107 | def test_boot_deploy_hddimg(self): | 107 | def test_boot_deploy_hddimg(self): |
108 | """Test runqemu deploy_dir_image hddimg""" | 108 | """Test runqemu deploy_dir_image hddimg""" |
@@ -166,9 +166,9 @@ class QemuTest(OESelftestTestCase): | |||
166 | def setUpClass(cls): | 166 | def setUpClass(cls): |
167 | super(QemuTest, cls).setUpClass() | 167 | super(QemuTest, cls).setUpClass() |
168 | cls.recipe = 'core-image-minimal' | 168 | cls.recipe = 'core-image-minimal' |
169 | cls.machine = get_bb_var('MACHINE') | 169 | cls.machine = get_bb_var('MACHINE') |
170 | cls.deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') | 170 | cls.deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') |
171 | cls.image_link_name = get_bb_var('IMAGE_LINK_NAME', cls.recipe) | 171 | cls.image_link_name = get_bb_var('IMAGE_LINK_NAME', cls.recipe) |
172 | cls.cmd_common = "runqemu nographic" | 172 | cls.cmd_common = "runqemu nographic" |
173 | cls.qemuboot_conf = "%s.qemuboot.conf" % (cls.image_link_name) | 173 | cls.qemuboot_conf = "%s.qemuboot.conf" % (cls.image_link_name) |
174 | cls.qemuboot_conf = os.path.join(cls.deploy_dir_image, cls.qemuboot_conf) | 174 | cls.qemuboot_conf = os.path.join(cls.deploy_dir_image, cls.qemuboot_conf) |