luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-15 06:36:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

test-msys2.sh: Copy built DLLs into each directory with tests

Browse Source 
This works around a Meson bug where a system-wide installed copy of
GLib can incorrectly get used in preference to the just-built copy
(see https://github.com/mesonbuild/meson/issues/12330).

In principle some of these are unnecessary (for example libgio-2.0-0.dll
only needs to be in gio/tests/ and girepository/tests/) but it's simpler
to copy each DLL to each tests directory.

Fixes: c428d6e6 "ci: Build and tar the platform specific documentation"
Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/3262
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
2024-02-14 13:50:45 +00:00
parent b974fa4e50
commit d9ac253649
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.gitlab-ci/test-msys2.sh
View File

@ -55,6 +55,23 @@ if [[ "$CFLAGS" == *"-coverage"* ]]; then
--output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov" --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
fi fi
# FIXME: Workaround for https://github.com/mesonbuild/meson/issues/12330
for tests in \
gio/tests \
girepository/tests \
glib/tests \
gmodule/tests \
gobject/tests \
gthread/tests \
; do
cp _build/glib/libglib-2.0-0.dll "_build/$tests/"
cp _build/gmodule/libgmodule-2.0-0.dll "_build/$tests/"
cp _build/gobject/libgobject-2.0-0.dll "_build/$tests/"
cp _build/gthread/libgthread-2.0-0.dll "_build/$tests/"
cp _build/gio/libgio-2.0-0.dll "_build/$tests/"
cp _build/girepository/libgirepository-2.0-0.dll "_build/$tests/"
done
meson test -C _build -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" meson test -C _build -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}"
meson test -C _build -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ meson test -C _build -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
--setup=unstable_tests --suite=failing --suite=flaky || true --setup=unstable_tests --suite=failing --suite=flaky || true