Re: [OE-core] [PATCH v5 4/5] oeqa/sdk/meson: improve test to validate host/build target assignments

[Tom Hochstein <tom.hochstein@oss.nxp.com>]

On 4/8/2025 10:10 AM, Tom Hochstein via lists.openembedded.org wrote:
> On 4/8/2025 8:37 AM, Mathieu Dubois-Briand wrote:
>> [You don't often get email from mathieu.dubois-briand@bootlin.com. 
>> Learn why this is important at 
>> https://aka.ms/LearnAboutSenderIdentification ]
>>
>> On Mon Apr 7, 2025 at 11:18 PM CEST, Tom Hochstein via 
>> lists.openembedded.org wrote:
>>> From: Ross Burton <ross.burton@arm.com>
>>>
>>> Use 'meson introspect' to dump JSON describing the build configuration
>>> and validate that the build and host architectures are correctly set in
>>> the meson.cross file.
>>>
>>> Also instead of calling ninja directly, call the relevant meson 
>>> commands.
>>>
>>> Fixes: [YOCTO #15485]
>>> Signed-off-by: Ross Burton <ross.burton@arm.com>
>>> Signed-off-by: Tom Hochstein <tom.hochstein@oss.nxp.com>
>>> ---
>>>   meta/lib/oeqa/sdk/cases/meson.py | 18 +++++++++++++-----
>>>   1 file changed, 13 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/meta/lib/oeqa/sdk/cases/meson.py 
>>> b/meta/lib/oeqa/sdk/cases/meson.py
>>> index 1edf78720a..407b94d242 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
>>> @@ -39,10 +40,17 @@ class MesonTest(OESDKTestCase):
>>>               self.assertTrue(os.path.isdir(dirs["source"]))
>>>               os.makedirs(dirs["build"])
>>>
>>> -            log = self._run("meson --warnlevel 1 -Degl=no -Dglx=no 
>>> -Dx11=false {build} {source}".format(**dirs))
>>> -            # Check that Meson thinks we're doing a cross build and 
>>> not a native
>>> -            self.assertIn("Build type: cross build", log)
>>> -            self._run("ninja -C {build} -v".format(**dirs))
>>> -            self._run("DESTDIR={install} ninja -C {build} -v 
>>> install".format(**dirs))
>>> +            log = self._run("meson setup --warnlevel 1 -Degl=no 
>>> -Dglx=no -Dx11=false {build} {source}".format(**dirs))
>>> +
>>> +            # Check that the host (gcc) and build (cross-gcc) 
>>> compilers are different
>>> +            data = json.loads(self._run("meson introspect 
>>> --compilers {build}".format(**dirs)))
>>> +            self.assertNotEqual(data["build"]["c"]["exelist"], 
>>> data["host"]["c"]["exelist"])
>>> +            # Check that the system architectures were set correctly
>>> +            data = json.loads(self._run("meson introspect --machines 
>>> {build}".format(**dirs)))
>>> +            self.assertEqual(data["build"]["cpu"], self.td["SDK_ARCH"])
>>> +            self.assertEqual(data["host"]["cpu"], self.td["HOST_ARCH"])
>>> +
>>> +            self._run("meson compile -C {build} -v".format(**dirs))
>>> +            self._run("meson install -C {build} --destdir 
>>> {install}".format(**dirs))
>>>
>>>               self.check_elf(os.path.join(dirs["install"], "usr", 
>>> "local", "lib", "libepoxy.so"))
>>
>> Hi,
>>
>> Thanks for the new version, but we have a new error now:
>>
>> Traceback (most recent call last):
>>    File 
>> "/srv/pokybuild/yocto-worker/qemux86/build/meta/lib/oeqa/sdk/cases/meson.py", line 47, in test_epoxy
>>      self.assertNotEqual(data["build"]["c"]["exelist"], 
>> data["host"]["c"]["exelist"])
>>                          ~~~~~~~~~~~~~^^^^^
>> KeyError: 'c'
> 
> Thanks, Mathieu.
> 
> Ross, can you have a look?

An update: I thought this was working for me, but I realize now that I 
may not be running the modified test. This is what I ended up running 
after looking around using oe-selftest list commands, as it was the only 
thing that looked close to an SDK meson test:

`oe-selftest -r devtool.DevtoolIdeSdkTests.test_devtool_ide_sdk_code_meson`

How do I run the modified test?

> 
>>
>> https://autobuilder.yoctoproject.org/valkyrie/#/builders/30/builds/1330
>>
>> Can you have a look at this please?
>>
>> -- 
>> Mathieu Dubois-Briand, Bootlin
>> Embedded Linux and Kernel engineering
>> https://bootlin.com
>>
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#214542): https://lists.openembedded.org/g/openembedded-core/message/214542
> Mute This Topic: https://lists.openembedded.org/mt/112142020/3617670
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [tom.hochstein@oss.nxp.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>