Pierrick Bouvier <[email protected]> writes: > On 6/1/2026 9:15 AM, Alex Bennée wrote: >> Pierrick Bouvier <[email protected]> writes: >> >>> On 6/1/2026 7:31 AM, Alex Bennée wrote: >>>> Unfortunately a previous fix to ensure .ninja-goals was set for the >>>> TCG tests broken the ability to run check-functional-FOO. As we have >>>> now reverted we need a solution for the MacOS gitlab run. The simplest >>>> is to add an explicit make invocation to build the signed binaries >>>> before we run the tests. >>>> >>>> Signed-off-by: Alex Bennée <[email protected]> >>>> --- >>>> .gitlab-ci.d/macos.yml | 3 +++ >>>> 1 file changed, 3 insertions(+) >>>> >>>> diff --git a/.gitlab-ci.d/macos.yml b/.gitlab-ci.d/macos.yml >>>> index f61750a3f4a..8366b4ad564 100644 >>>> --- a/.gitlab-ci.d/macos.yml >>>> +++ b/.gitlab-ci.d/macos.yml >>>> @@ -29,6 +29,7 @@ >>>> - cd build >>>> - ../configure --enable-werror $CONFIGURE_ARGS || { cat config.log >>>> meson-logs/meson-log.txt; exit 1; } >>>> - $MAKE -j$(sysctl -n hw.ncpu) >>>> + - for TARGET in $TEST_BINARIES ; do $MAKE $TARGET ; done >>>> - for TARGET in $TEST_TARGETS ; do $MAKE $TARGET ; done >>>> >>>> aarch64-macos-15-build: >>>> @@ -44,6 +45,7 @@ aarch64-macos-15-build: >>>> --cross-prefix-i386=i686-elf- >>>> --cross-prefix-x86_64=x86_64-elf- >>>> --disable-plugins >>>> + TEST_BINARIES: qemu-system-aarch64 qemu-system-i386 qemu-system-x86_64 >>>> TEST_TARGETS: check-unit run-tcg-tests-aarch64-softmmu >>>> run-tcg-tests-i386-softmmu run-tcg-tests-x86_64-softmmu >>>> >>>> aarch64-macos-26-build: >>>> @@ -60,4 +62,5 @@ aarch64-macos-26-build: >>>> --cross-prefix-i386=i686-elf- >>>> --cross-prefix-x86_64=x86_64-elf- >>>> --disable-plugins >>>> + TEST_BINARIES: qemu-system-aarch64 qemu-system-i386 qemu-system-x86_64 >>>> TEST_TARGETS: check-unit run-tcg-tests-aarch64-softmmu >>>> run-tcg-tests-i386-softmmu run-tcg-tests-x86_64-softmmu >>> >>> Could make all be enough? >> >> No - not without the goal having the signed binaries in them. >> > > Which comes back to my initial (unanswered question), why do we need > signed binaries for running tcg tests? > Signed is only for HVF access.
Because it exposes a bug in our build system: [email protected] Ideally we should build the final product - whatever it may be - from make all. However I suspect we can't achieve that given the circular Makefile dependency until check-tcg is integrated into meson. I will review you suggested path forwards tomorrow. > >>> >>> Reviewed-by: Pierrick Bouvier <[email protected]> >> -- Alex Bennée Virtualisation Tech Lead @ Linaro
