From 1c84361829921e91d782b189e2bde818a2d1491c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sat, 10 May 2025 09:43:47 +0100 Subject: [PATCH] oeqa/sdk/meson: add check that meson has detected the target correctly Use 'meson introspect' to dump JSON describing the build configuration and validate that the target architectures and cross-compiler is correctly set. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdk/cases/meson.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/lib/oeqa/sdk/cases/meson.py b/meta/lib/oeqa/sdk/cases/meson.py index 4fb101f9f73..a809ca3a537 100644 --- a/meta/lib/oeqa/sdk/cases/meson.py +++ b/meta/lib/oeqa/sdk/cases/meson.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: MIT # +import json import os import subprocess import tempfile @@ -36,6 +37,14 @@ class MesonTestBase(OESDKTestCase): # Check that Meson thinks we're doing a cross build and not a native self.assertIn("Build type: cross build", log) + # 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"]) + + # 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._run(f"meson compile -C {builddir} -v") if installdir: -- 2.47.3