Generalise this test so that it works on more than qemux86-64: - Don't edit a file in arch/x86 to cause a rebuild, instead use init/ - Look for the edits in the build tree, as the deployed kernel

When a test case starts, self.td is populated with all the variables in the data store. Typically this can be used instead of get_bb_var(), which saves a bitbake call per variable lookup. The only

Instead of using string concatenation, use os.path.join. Signed-off-by: Ross Burton <ross.burton@...> --- meta/lib/oeqa/selftest/cases/wic.py | 92 ++++++++++++++--------------- 1 file changed,

Split the tests into further classes: one which exercises the CLI and doesn't need to build images at all, and another which is just the tests that manipulate existing images. Signed-off-by: Ross

Use os.path.join to construct paths, and invoke bitbake once instead of three times. Signed-off-by: Ross Burton <ross.burton@...> --- meta/lib/oeqa/selftest/cases/wic.py | 12 ++++-------- 1

OEScriptTests currently skips if cairo isn't present, and does a build of core-image-minimal. This is only required for the OEPybootchartguyTests tests, so move that logic there so that

Signed-off-by: Ross Burton <ross.burton@...> --- meta/lib/oeqa/core/decorator/data.py | 44 ++++--------------- meta/lib/oeqa/runtime/cases/boot.py | 2 +-

There may be environments or machines which don't have working runqemu, so tag all of the tests which use runqemu() so that they can be skipped. Signed-off-by: Ross Burton <ross.burton@...> ---

has_feature() should be splitting the feature string into substrings and then looking for membership instead of looking for simple substrings. has_machine() should be using equality instead of

--- meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py | 2 +- meta/lib/oeqa/selftest/cases/binutils.py | 5 +---- meta/lib/oeqa/selftest/cases/buildoptions.py | 2 +-

This file dates back to 2016. Half of the functions have never been used, the rest are used in one place and have now been replaced. Signed-off-by: Ross Burton <ross.burton@...> ---

updateTestData() is just a simple loop that is only used here, so just inline it. Signed-off-by: Ross Burton <ross.burton@...> --- meta/classes/testimage.bbclass | 4 ++-- 1 file changed, 2

There's no need to wrap *tags in a potential list, as *tags will always be a tuple. Signed-off-by: Ross Burton <ross.burton@...> --- meta/lib/oeqa/core/decorator/__init__.py | 11 +++-------- 1

There's no need to use a series of over-generalised functions to just wrap a string in a tuple. Signed-off-by: Ross Burton <ross.burton@...> --- meta/lib/oeqa/runtime/decorator/package.py | 9

test_arch_work_dir_and_export_source uses the archiver to generate SRPMS, so explicitly set PACKAGE_CLASSES to ensure that package_rpm is used. Signed-off-by: Ross Burton <ross.burton@...> ---

Some tests which are marked as x86-specific will actually work on aarch64 (e.g. use EFI), whilst some other tests really are x86-specific (e.g. use syslinux). Signed-off-by: Ross Burton

Don't assume bzImage, resepct KERNEL_IMAGETYPE. Signed-off-by: Ross Burton <ross.burton@...> --- meta/lib/oeqa/selftest/cases/wic.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4

There's no need to pass a recipe name when determining the target architecture, there's no need to cap the size of the lru_cache as it will only have one entry, and __name__ is set by

By default bitbake() will raise an assertion if it fails, so there's no need to wrap it in a further assert. Signed-off-by: Ross Burton <ross.burton@...> --- meta/lib/oeqa/selftest/cases/wic.py

bb.utils.rename() only exists to handle moves across filesystems. As these moves are within the same directory we can just use os.rename(). Signed-off-by: Ross Burton <ross.burton@...> ---