Skip to contentSkip to conversation

oeqa/selftest/context: Rely on bitbake-getvar --value to only return value

PATCH New Peter Kjellerstedt 1 participant 1 message Sep 23, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 oeqa/selftest/context: Rely on bitbake-getvar --value to only return value

Before, "bitbake-getvar --value <var>" would include log output together with the value. This was handled by piping the output to "tail -1". Now, "bitbake-getvar --value" will no longer output any logs so the piping to "tail" is no longer needed.

---

This of course relies on the corresponding patch for bitbake-getvar to have been applied first.

 meta/lib/oeqa/selftest/context.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/context.py +1 -1
index 5a09aeedff..c148aa5aab 100644
@@ -111,7 +111,7 @@ class OESelftestTestContext(OETestContext):
 
         # Relative paths in BBLAYERS only works when the new build dir share the same ascending node
         if self.newbuilddir:
-            bblayers = subprocess.check_output("bitbake-getvar --value BBLAYERS | tail -1", cwd=builddir, shell=True, text=True)
+            bblayers = subprocess.check_output("bitbake-getvar --value BBLAYERS", cwd=builddir, shell=True, text=True)
             if '..' in bblayers:
                 bblayers_abspath = [os.path.abspath(path) for path in bblayers.split()]
                 with open("%s/conf/bblayers.conf" % newbuilddir, "a") as f: