]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
oeqa selftest wic.py: apply build config to runqemu too
authorMikko Rapeli <mikko.rapeli@linaro.org>
Thu, 24 Oct 2024 08:54:17 +0000 (11:54 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 25 Oct 2024 14:10:25 +0000 (15:10 +0100)
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.

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/selftest/cases/wic.py

index 972fffe6f8225408ee873bb30b0ad18cd6a51b6b..5e475f9e3fca1a96364828ddabeec74aacc89e57 100644 (file)
@@ -1374,7 +1374,6 @@ IMAGE_CLASSES:remove = 'testimage'
         self.append_config(config)
         bitbake('core-image-base u-boot')
         runqemu_params = get_bb_var('TEST_RUNQEMUPARAMS', 'core-image-base') or ""
-        self.remove_config(config)
 
         with runqemu('core-image-base', ssh=False,
                      runqemuparams='%s nographic' % (runqemu_params), image_fstype='wic') as qemu:
@@ -1387,6 +1386,7 @@ IMAGE_CLASSES:remove = 'testimage'
             cmd = "cat /boot/loader/entries/boot.conf"
             status, output = qemu.run_serial(cmd)
             self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))
+        self.remove_config(config)
 
     @skipIfNotArch(['i586', 'i686', 'x86_64'])
     @OETestTag("runqemu")