oe-selftest: fitimage refactor classes

Make the new KernelFitImageRecipeTests class the one that contains the
code, and keep the KernelFitImageTests class as the one that just adds
back the same tests. This will make it easier to delete the tests later,
which will hopefully become obsolete when the kernel-fitimage.bbclass
class is no longer needed.

(From OE-Core rev: 622c446c7c6139ed12c2fa2d9cffa108a85f4390)

Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Adrian Freihofer 2025-06-03 10:23:27 +02:00 committed by Richard Purdie
parent e339b99ca1
commit 2b23528cde

View File

@ -393,7 +393,7 @@ class FitImageTestCase(OESelftestTestCase):
self._check_fitimage(bb_vars, fitimage_path, uboot_tools_bindir)
class KernelFitImageBase(FitImageTestCase):
"""Test cases for the kernel-fitimage bbclass"""
"""Test cases for the linux-yocto-fitimage recipe"""
def _fit_get_bb_vars(self, additional_vars=[]):
"""Retrieve BitBake variables specific to the test case.
@ -435,15 +435,15 @@ class KernelFitImageBase(FitImageTestCase):
return bb_vars
def _config_add_kernel_classes(self, config):
config += '# Use kernel-fitimage.bbclass for the creation of the fitImage' + os.linesep
config += 'KERNEL_IMAGETYPES += " fitImage "' + os.linesep
config += 'KERNEL_CLASSES = " kernel-fitimage "' + os.linesep
config += '# Use kernel-fit-extra-artifacts.bbclass for the creation of the vmlinux artifact' + os.linesep
config += 'KERNEL_CLASSES = "kernel-fit-extra-artifacts"' + os.linesep
config += '# Avoid naming clashes in the deploy folder with kernel-fitimage.bbclass artifacts' + os.linesep
config += 'KERNEL_DEPLOYSUBDIR = "linux-yocto-fitimage"' + os.linesep
return config
@property
def kernel_recipe(self):
# virtual/kernel does not work with SRC_URI:append:pn-%s
return "linux-yocto"
return "linux-yocto-fitimage"
def _config_add_uboot_env(self, config):
"""Generate an u-boot environment
@ -738,7 +738,7 @@ class KernelFitImageBase(FitImageTestCase):
self.assertEqual(found_comments, num_signatures, "Expected %d signed and commented (%s) sections in the fitImage." %
(num_signatures, a_comment))
class KernelFitImageTests(KernelFitImageBase):
class KernelFitImageRecipeTests(KernelFitImageBase):
"""Test cases for the kernel-fitimage bbclass"""
def test_fit_image(self):
@ -1022,18 +1022,18 @@ FIT_HASH_ALG = "sha256"
self._gen_signing_key(bb_vars)
self._test_fitimage(bb_vars)
class KernelFitImageRecipeTests(KernelFitImageTests):
"""Test cases for the linux-yocto-fitimage recipe"""
class KernelFitImageTests(KernelFitImageRecipeTests):
"""Test cases for the kernel-fitimage.bbclass"""
@property
def kernel_recipe(self):
return "linux-yocto-fitimage"
# virtual/kernel does not work with SRC_URI:append:pn-%s
return "linux-yocto"
def _config_add_kernel_classes(self, config):
config += '# Use kernel-fit-extra-artifacts.bbclass for the creation of the vmlinux artifact' + os.linesep
config += 'KERNEL_CLASSES = "kernel-fit-extra-artifacts"' + os.linesep
config += '# Avoid naming clashes in the deploy folder with kernel-fitimage.bbclass artifacts' + os.linesep
config += 'KERNEL_DEPLOYSUBDIR = "linux-yocto-fitimage"' + os.linesep
config += '# Use kernel-fitimage.bbclass for the creation of the fitImage' + os.linesep
config += 'KERNEL_IMAGETYPES += " fitImage "' + os.linesep
config += 'KERNEL_CLASSES = " kernel-fitimage "' + os.linesep
return config
class FitImagePyTests(KernelFitImageBase):