Skip to contentSkip to conversation

oeqa/sdk/cases/meson.py: fix assertion for multilib

PATCH New [email protected] 1 participant 1 message Dec 3, 2025 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 oeqa/sdk/cases/meson.py: fix assertion for multilib

From: Chen Qi <[email protected]>

In case of multilib, the values of CC and HOST_ARCH in self.td are not valid for lib32. We need to use the env vars sourced by the env script.

---
 meta/lib/oeqa/sdk/cases/meson.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/sdk/cases/meson.py +2 -2
index a809ca3a53..7419988922 100644
@@ -39,11 +39,11 @@ class MesonTestBase(OESDKTestCase):
 
         # Check that the cross-compiler used is the one we set.
         data = json.loads(self._run(f"meson introspect --compilers {builddir}"))
-        self.assertIn(self.td.get("CC").split()[0], data["host"]["c"]["exelist"])
+        self.assertIn(self._run("echo $CC").split()[0], data["host"]["c"]["exelist"])
 
         # Check that the target architectures was set correctly.
         data = json.loads(self._run(f"meson introspect --machines {builddir}"))
-        self.assertEqual(data["host"]["cpu"], self.td["HOST_ARCH"])
+        self.assertEqual(data["host"]["cpu"], self._run("echo -n $OECORE_MESON_HOST_CPU"))
 
         self._run(f"meson compile -C {builddir} -v")
 
Signature · 1 line
2.43.0