[glib: 5/5] Merge branch 'wip/test-fail-convenience' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 4961c1c3b5e9d6052f60057d5696b723984cdc49
Merge: ae486f6dc 052e33550
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Aug 19 09:35:48 2021 +0000

    Merge branch 'wip/test-fail-convenience' into 'main'
    
    gtestutils: Add more convenience functions
    
    See merge request GNOME/glib!2215

 docs/reference/glib/glib-sections.txt |  3 ++
 gio/tests/desktop-app-info.c          |  3 +-
 gio/tests/socket.c                    | 40 +++++-------------
 gio/tests/trash.c                     | 19 ++-------
 glib/gtestutils.c                     | 78 +++++++++++++++++++++++++++++++++++
 glib/gtestutils.h                     |  9 ++++
 glib/tests/logging.c                  |  6 +--
 glib/tests/testing-helper.c           | 34 +++++++++++++++
 glib/tests/testing.c                  | 58 ++++++++++++++++++++++++++
 9 files changed, 198 insertions(+), 52 deletions(-)
---