CI: Add a meson test run for mingw

So far, we disable all GL and Vulkan testing, because neither of them
works in CI.
This commit is contained in:
Benjamin Otte
2024-10-18 12:31:55 +02:00
parent 88ffbb93b9
commit b3c1a753f1
2 changed files with 27 additions and 6 deletions

View File

@@ -68,6 +68,7 @@ style-check-diff:
- "${CI_PROJECT_DIR}/_build/meson-logs/testlog-x11.junit.xml"
- "${CI_PROJECT_DIR}/_build/meson-logs/testlog-wayland.junit.xml"
- "${CI_PROJECT_DIR}/_build/meson-logs/testlog-wayland_gl.junit.xml"
- "${CI_PROJECT_DIR}/_build/meson-logs/testlog-win32.junit.xml"
- "${CI_PROJECT_DIR}/_build/meson-logs/testlog-broadway.junit.xml"
paths:
- "${CI_PROJECT_DIR}/_build/meson-logs"
@@ -79,6 +80,8 @@ style-check-diff:
- "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
- "${CI_PROJECT_DIR}/_build/testsuite/headless/*/*.log"
- "${CI_PROJECT_DIR}/_build_hello/meson-logs"
# somewhat hacky to add this here, but avoids yaml madness
- "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
.build-fedora-default:
image: $FEDORA_IMAGE
@@ -192,6 +195,7 @@ fedora-mingw64:
script:
- C:\msys64\usr\bin\pacman --noconfirm -Syyuu
- C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
- C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/run-tests.sh _build win32 gtk"
cache:
key: "$CI_JOB_NAME"
paths:
@@ -203,16 +207,13 @@ fedora-mingw64:
- subprojects/pango/
msys2-ucrt64:
extends: .mingw-defaults
extends:
- .test-runner
- .mingw-defaults
needs: []
variables:
MSYSTEM: "UCRT64"
CHERE_INVOKING: "yes"
artifacts:
when: always
expose_as: 'Windows_DLL_MSYS2_64_bit_toolchain'
paths:
- "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
macos:
rules:

View File

@@ -90,6 +90,26 @@ case "${setup}" in
kill ${server}
;;
win32*)
meson test -C ${builddir} \
--quiet \
--timeout-multiplier "${multiplier}" \
--num-processes "${n_processes}" \
--maxfail "${max_fail}" \
--print-errorlogs \
--setup=${setup} \
--suite=${suite//,/ --suite=} \
--no-suite=failing \
--no-suite=${setup}_failing \
--no-suite=flaky \
--no-suite=headless \
--no-suite=gsk-compare-gl \
--no-suite=gsk-compare-ngl \
--no-suite=gsk-compare-vulkan \
--no-suite=gsk-compare-broadway
exit_code=$?
;;
*)
echo "Failed to add ${setup} to .gitlab-ci/run-tests.sh"
exit 1