From: Adrian Freihofer <[email protected]>
The fitimage selftests had two fundamental issues:
- dependency on meta-yocto-bsp
Several tests referenced `beaglebone-yocto` and the `bbb-dtbs-as-ext` recipe,
both of which live in meta-yocto-bsp, not in OE-core. The tests simply could
not pass in a plain OE-core setup.
- hardcoded MACHINE overrides the caller's configuration
Every test wrote `MACHINE = "beaglebone-yocto"` unconditionally into
`selftest.inc`. This means that regardless of what MACHINE the user or
autobuilder had configured, the tests always built for beaglebone. There are
two consequences:
This results in a false sense of test coverage:
- The test result says nothing about whether the active machine works — it
reports a pass for a machine that was silently substituted.
- In environments that configure the machine via OE_FRAGMENTS, bitbake
`bb.fatal()`s on a non-weak `MACHINE` assignment, so the tests fail
immediately without even attempting to build.
Patch 3 fixes both problems. Tests no longer write `MACHINE` to the config;
instead they read the active machine at runtime via `get_bb_var("MACHINE")` and
look it up in a new `_MACHINE_SETTINGS` dict. If the machine is not listed, the
test calls `self.skipTest()` — keeping the suite green while making it obvious
which machines are covered. Several correctness fixes follow naturally from
exercising real per-machine code paths (conditional `sign-images`, `setup-1` on
x86, graceful fallback when no key-holding DTB exists). The `bbb-dtbs-as-ext`
recipe is replaced by a machine-agnostic `test-dtbs-as-ext`.
That also means that the FIT image tests are now skipped for most machines,
which is not ideal. But if the FIT image infrastructure is used on those
machines, then the tests can be enabled by adding the appropriate settings to
`_MACHINE_SETTINGS` later on.
Patch 2 fixes a uboot-sign.bbclass bug exposed once the tests ran correctly
in sequence: `mkimage -K` was modifying `spl/u-boot-spl.dtb` in-place,
accumulating `required = "conf"` key nodes across test runs in the same work
directory and causing verification to fail for the second test.
Patch 1 is a trivial whitespace prerequisite.
Tested with `oe-selftest -r fitimage`
- on MACHINEs:
- qemuarm (successes=17, skipped=2)
- qemuarm64 (successes=19, skipped=0)
- qemux86-64 (successes=17, skipped=4)
- qemumips (successes=7, skipped=14)
this example is without a entry in _MACHINE_SETTINGS
- for bitbake-setup configurations:
- poky-master
- oe-nodistro-master (which has no meta-yocto-bsp)
Adrian Freihofer (3):
oeqa/selftest/fitimage: fix missing whitespace around assignment
uboot-sign: sign SPL FIT into a copy of the SPL DTB
oeqa/selftest/fitimage: use the provided DISTRO and MACHINE, skip if
unsupported
.../recipes-test/ext-dtb/bbb-dtbs-as-ext.bb | 29 -
.../ext-dtb/files/BBORG_RELAY-00A2.dts | 49 --
.../ext-dtb/files/am335x-bonegreen-ext.dts | 14 -
.../recipes-test/ext-dtb/files/test-ext.dts | 17 +
.../ext-dtb/files/test-overlay.dts | 14 +
.../recipes-test/ext-dtb/test-dtbs-as-ext.bb | 25 +
meta/classes-recipe/uboot-sign.bbclass | 14 +-
meta/lib/oeqa/selftest/cases/fitimage.py | 538 +++++++++++++-----
8 files changed, 469 insertions(+), 231 deletions(-)
delete mode 100644 meta-selftest/recipes-test/ext-dtb/bbb-dtbs-as-ext.bb
delete mode 100644
meta-selftest/recipes-test/ext-dtb/files/BBORG_RELAY-00A2.dts
delete mode 100644
meta-selftest/recipes-test/ext-dtb/files/am335x-bonegreen-ext.dts
create mode 100644 meta-selftest/recipes-test/ext-dtb/files/test-ext.dts
create mode 100644 meta-selftest/recipes-test/ext-dtb/files/test-overlay.dts
create mode 100644 meta-selftest/recipes-test/ext-dtb/test-dtbs-as-ext.bb
--
2.54.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#238216):
https://lists.openembedded.org/g/openembedded-core/message/238216
Mute This Topic: https://lists.openembedded.org/mt/119676456/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
