Skip to contentSkip to conversation

oeqa/selftest: Fix failure when configuration contains BBLAYERS:append

PATCH In review Oleksandr Hnatiuk 1 participant 2 messages Dec 9, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 oeqa/selftest: Fix failure when configuration contains BBLAYERS:append

When used with --newbuilddir option, it replaces relative paths in BBLAYERS variable with absolute paths by evaluating the final value of the variable, converting paths and saving result by assignment (BBLAYERS =) at the end of bblayers.conf.

This breaks tests when bblayers.conf contains BBLAYERS:append because :append statements are evaluated after all assignments and we end up with the appended layer added twice - first by evaluating final value of the variable, then again by bitbake evaluating BBLAYERS:append.

The error is as follows:
AssertionError: Command 'bitbake -e' returned non-zero exit status 1:
ERROR: Found duplicated BBFILE_COLLECTIONS 'layer-name', check bblayers.conf or layer.conf to fix it.

---
 meta/lib/oeqa/selftest/context.py | 1 +
 1 file changed, 1 insertion(+)
meta/lib/oeqa/selftest/context.py +1 -0
index acc3b073bd11..5eb4cc44fd3c 100644
@@ -114,6 +114,7 @@ class OESelftestTestContext(OETestContext):
                 bblayers_abspath = [os.path.abspath(path) for path in bblayers.split()]
                 with open("%s/conf/bblayers.conf" % newbuilddir, "a") as f:
                     newbblayers = "# new bblayers to be used by selftest in the new build dir '%s'\n" % newbuilddir
+                    newbblayers += 'unset BBLAYERS\n'
                     newbblayers += 'BBLAYERS = "%s"\n' % ' '.join(bblayers_abspath)
                     f.write(newbblayers)
 
Signature · 1 line
2.35.6