From a91064bc32f62e4e48f6191963c776f9cb74afa4 Mon Sep 17 00:00:00 2001 From: Marios Paouris Date: Sat, 20 Jan 2024 10:43:12 +0200 Subject: [PATCH] Added WINEPATH to fix MinGW CI tests Signed-off-by: Marios Paouris --- .gitlab-ci.yml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f18babfb..4f0eaf4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -609,9 +609,9 @@ MinGW32/GnuTLS: - ./autogen.sh - mingw32-configure --without-gnutls-version-check CFLAGS=-g - make -j4 -# These tests seem to fail due to wine failing to start; setting as XFAIL -# since these never run before this patch set. - - make VERBOSE=1 -j4 check XFAIL_TESTS="sigterm dtls-psk" +# Setup wine path so tests won't fail due to unresolved dll dependencies + - export WINEPATH=/usr/i686-w64-mingw32/sys-root/mingw/bin\;. + - make VERBOSE=1 -j4 check tags: - shared except: @@ -632,10 +632,9 @@ MinGW32/OpenSSL: - ./autogen.sh - mingw32-configure --without-gnutls --with-openssl --without-openssl-version-check CFLAGS=-g - make -j4 -# These tests seem to fail due to wine failing to start; setting as XFAIL -# since these never run before this patch set. bad_dtls_test fails due -# to an issue in fedora's openssl. - - make VERBOSE=1 -j4 check XFAIL_TESTS="sigterm dtls-psk bad_dtls_test.exe" +# Setup wine path so tests won't fail due to unresolved dll dependencies + - export WINEPATH=/usr/i686-w64-mingw32/sys-root/mingw/bin\;. + - make VERBOSE=1 -j4 check tags: - shared except: @@ -657,9 +656,9 @@ MinGW64/GnuTLS: - ./autogen.sh - mingw64-configure --without-gnutls-version-check CFLAGS=-g - make -j4 -# These tests seem to fail due to wine failing to start; setting as XFAIL -# since these never run before this patch set. - - make VERBOSE=1 -j4 check XFAIL_TESTS="sigterm dtls-psk" +# Setup wine path so tests won't fail due to unresolved dll dependencies + - export WINEPATH=/usr/x86_64-w64-mingw32/sys-root/mingw/bin\;. + - make VERBOSE=1 -j4 check tags: - shared except: @@ -681,10 +680,9 @@ MinGW64/OpenSSL: - ./autogen.sh - mingw64-configure --without-gnutls --with-openssl --without-openssl-version-check CFLAGS=-g - make -j4 -# These tests seem to fail due to wine failing to start; setting as XFAIL -# since these never run before this patch set. bad_dtls_test fails due -# to an issue in fedora's openssl. - - make VERBOSE=1 -j4 check XFAIL_TESTS="sigterm dtls-psk bad_dtls_test.exe" +# Setup wine path so tests won't fail due to unresolved dll dependencies + - export WINEPATH=/usr/x86_64-w64-mingw32/sys-root/mingw/bin\;. + - make VERBOSE=1 -j4 check tags: - shared except: -- 2.50.1