From 5d5dbc024bfc97b6d362f1f6eb1d40d4d1e533aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Mon, 1 Jun 2026 15:31:28 +0100 Subject: [PATCH] gitlab: work around the inability to build targets for MacOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Reviewed-by: Pierrick Bouvier Tested-by: Cornelia Huck # running tests on an s390x Message-ID: <20260601143129.144786-3-alex.bennee@linaro.org> Signed-off-by: Alex Bennée --- .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 f61750a3f4..8366b4ad56 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