Skip to content

Commit

Permalink
tests/docker: update test-mingw to run single build
Browse files Browse the repository at this point in the history
While the test-build test happily run for mingw the test-mingw case
runs more of the packaging inline with what our CI does. It however
fails if we don't find both compilers and expects to be run on a
docker image with both.

Remove that distinction and make it work more like the other build
test scripts.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20221027183637.2772968-3-alex.bennee@linaro.org>
  • Loading branch information
stsquad committed Oct 31, 2022
1 parent 5b1229f commit b131419
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions tests/docker/test-mingw
Expand Up @@ -13,14 +13,12 @@

. common.rc

requires_binary x86_64-w64-mingw32-gcc
requires_binary i686-w64-mingw32-gcc
requires_binary x86_64-w64-mingw32-gcc i686-w64-mingw32-gcc

cd "$BUILD_DIR"

for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
build_qemu --cross-prefix=$prefix \
TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
build_qemu \
--enable-trace-backends=simple \
--enable-gnutls \
--enable-nettle \
Expand All @@ -29,8 +27,6 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
--enable-bzip2 \
--enable-guest-agent \
--enable-docs
install_qemu
make installer
make clean

done
install_qemu
make installer
make clean

0 comments on commit b131419

Please sign in to comment.