luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci-msys2-mingw32-catch-access-violation' into 'main'

Browse Source 
CI/msys2-mingw32: Set the G_DEBUGGER environment variable

See merge request GNOME/glib!4205
This commit is contained in:
Philip Withnall 2024-08-25 15:36:08 +00:00
commit 282545565a
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -521,6 +521,7 @@ msys2-mingw32:
CHERE_INVOKING: "yes" CHERE_INVOKING: "yes"
CFLAGS: -coverage -ftest-coverage -fprofile-arcs CFLAGS: -coverage -ftest-coverage -fprofile-arcs
PYTHONUTF8: "1" PYTHONUTF8: "1"
G_DEBUGGER: 'gdb.exe -batch -ex "set logging enabled on" -ex "attach %p" -ex "signal-event %e" -ex "c" -ex "thread apply all bt full" -ex "k"'
script: script:
- C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20 - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
- C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh - C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh
@ -535,6 +536,7 @@ msys2-mingw32:
expire_in: 1 week expire_in: 1 week
paths: paths:
- _build/meson-logs - _build/meson-logs
- _build/gdb.txt
- _coverage/ - _coverage/
- _reference/ - _reference/

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

@ -21,7 +21,8 @@ pacman --noconfirm -S --needed \
"${MINGW_PACKAGE_PREFIX}"-python-pip \ "${MINGW_PACKAGE_PREFIX}"-python-pip \
"${MINGW_PACKAGE_PREFIX}"-toolchain \ "${MINGW_PACKAGE_PREFIX}"-toolchain \
"${MINGW_PACKAGE_PREFIX}"-zlib \ "${MINGW_PACKAGE_PREFIX}"-zlib \
"${MINGW_PACKAGE_PREFIX}"-libelf "${MINGW_PACKAGE_PREFIX}"-libelf \
"${MINGW_PACKAGE_PREFIX}"-gdb
mkdir -p _coverage mkdir -p _coverage
mkdir -p _ccache mkdir -p _ccache

4
glib/gmain.c
View File

@ -1435,7 +1435,7 @@ g_source_get_context (GSource *source)
* *
* Using this API forces the linear scanning of event sources on each * Using this API forces the linear scanning of event sources on each
* main loop iteration. Newly-written event sources should try to use * main loop iteration. Newly-written event sources should try to use
* [method@GLib.Source.add_unix_fd] instead of this API. * `g_source_add_unix_fd` instead of this API.
**/ **/
void void
g_source_add_poll (GSource *source, g_source_add_poll (GSource *source,
@ -4668,7 +4668,7 @@ g_main_context_poll_unlocked (GMainContext *context,
* *
* Adds a file descriptor to the set of file descriptors polled for * Adds a file descriptor to the set of file descriptors polled for
* this context. This will very seldom be used directly. Instead * this context. This will very seldom be used directly. Instead
* a typical event source will use [method@GLib.Source.add_unix_fd] instead. * a typical event source will use `g_source_add_unix_fd` instead.
**/ **/
void void
g_main_context_add_poll (GMainContext *context, g_main_context_add_poll (GMainContext *context,