Parcourir la source

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>
Mikko Rapeli il y a 7 mois
Parent
commit
9d287835b2
1 fichiers modifiés avec 1 ajouts et 1 suppressions
  1. 1 1
      meta/lib/oeqa/selftest/cases/wic.py

+ 1 - 1
meta/lib/oeqa/selftest/cases/wic.py

@@ -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")