From: Ross Burton Date: Thu, 31 Mar 2022 18:28:59 +0000 (+0100) Subject: oeqa/selftest/wic: don't hardcode kernel image type in test_wic_rm X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~4560 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f03d47833593734489e73f054f41c3dbbe423204;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git oeqa/selftest/wic: don't hardcode kernel image type in test_wic_rm Don't assume bzImage, resepct KERNEL_IMAGETYPE. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni --- diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 317b80ea27b..eb376e1e2c5 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -1337,21 +1337,23 @@ class Wic2(WicTestCase): self.assertEqual(1, len(images)) sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') + # Not bulletproof but hopefully sufficient + kerneltype = get_bb_var('KERNEL_IMAGETYPE', 'virtual/kernel') # list directory content of the first partition result = runCmd("wic ls %s:1 -n %s" % (images[0], sysroot)) - self.assertIn('\nBZIMAGE ', result.output) + self.assertIn('\n%s ' % kerneltype.upper(), result.output) self.assertIn('\nEFI ', result.output) - # remove file - runCmd("wic rm %s:1/bzimage -n %s" % (images[0], sysroot)) + # remove file. EFI partitions are case-insensitive so exercise that too + runCmd("wic rm %s:1/%s -n %s" % (images[0], kerneltype.lower(), sysroot)) # remove directory runCmd("wic rm %s:1/efi -n %s" % (images[0], sysroot)) # check if they're removed result = runCmd("wic ls %s:1 -n %s" % (images[0], sysroot)) - self.assertNotIn('\nBZIMAGE ', result.output) + self.assertNotIn('\n%s ' % kerneltype.upper(), result.output) self.assertNotIn('\nEFI ', result.output) def test_mkfs_extraopts(self):