diff options
author | Mikko Rapeli <mikko.rapeli@linaro.org> | 2024-10-24 11:54:17 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-10-25 15:12:22 +0100 |
commit | 9d287835b2ecec53f191863d3f5380ef397ade27 (patch) | |
tree | a17027f1740db5c9b18ab2e0ba95b3ff58c5c7b9 /meta/lib/oeqa | |
parent | 36f7e52567fa1f6fbc0b8607bcdb9090a0450ad0 (diff) | |
download | poky-9d287835b2ecec53f191863d3f5380ef397ade27.tar.gz |
oeqa selftest wic.py: apply build config to runqemu too
Build configuration is applied to bitbake build command
but removed before calling runqemu. Thus disabling KVM
support on aarc64 host was not effective. Note that this
pattern is used in a lot of tests. KVM gets enabled
via CI scripts.
(From OE-Core rev: 7a9fbf509fec2e149fd5702552bc4d819969ab1f)
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/wic.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 972fffe6f8..5e475f9e3f 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py | |||
@@ -1374,7 +1374,6 @@ IMAGE_CLASSES:remove = 'testimage' | |||
1374 | self.append_config(config) | 1374 | self.append_config(config) |
1375 | bitbake('core-image-base u-boot') | 1375 | bitbake('core-image-base u-boot') |
1376 | runqemu_params = get_bb_var('TEST_RUNQEMUPARAMS', 'core-image-base') or "" | 1376 | runqemu_params = get_bb_var('TEST_RUNQEMUPARAMS', 'core-image-base') or "" |
1377 | self.remove_config(config) | ||
1378 | 1377 | ||
1379 | with runqemu('core-image-base', ssh=False, | 1378 | with runqemu('core-image-base', ssh=False, |
1380 | runqemuparams='%s nographic' % (runqemu_params), image_fstype='wic') as qemu: | 1379 | runqemuparams='%s nographic' % (runqemu_params), image_fstype='wic') as qemu: |
@@ -1387,6 +1386,7 @@ IMAGE_CLASSES:remove = 'testimage' | |||
1387 | cmd = "cat /boot/loader/entries/boot.conf" | 1386 | cmd = "cat /boot/loader/entries/boot.conf" |
1388 | status, output = qemu.run_serial(cmd) | 1387 | status, output = qemu.run_serial(cmd) |
1389 | self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) | 1388 | self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) |
1389 | self.remove_config(config) | ||
1390 | 1390 | ||
1391 | @skipIfNotArch(['i586', 'i686', 'x86_64']) | 1391 | @skipIfNotArch(['i586', 'i686', 'x86_64']) |
1392 | @OETestTag("runqemu") | 1392 | @OETestTag("runqemu") |