Message ID | 20221013154705.1846261-3-alex.bennee@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | testing/next (configure, RUNC, win32|64) | expand |
On 13/10/22 17:47, Alex Bennée wrote: > 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. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/test-mingw | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index 0bc6d78872..18366972eb 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -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 \ @@ -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
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. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/test-mingw | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)