[glib: 6/6] Merge branch 'wip/pwithnall/ci-fixes' into 'main'

[Emmanuele Bassi <ebassi src gnome org>]

commit 618d6873fd5a4e6c611159630264fa15351eeb8c
Merge: 4ebf31683 4d237daf3
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Mon Mar 7 09:24:10 2022 +0000

    Merge branch 'wip/pwithnall/ci-fixes' into 'main'
    
    Various unit test fixes
    
    See merge request GNOME/glib!2538

 gio/tests/converter-stream.c |  5 ++++-
 gio/tests/gdbus-threading.c  | 15 +++++++++++----
 gio/tests/meson.build        |  6 +-----
 glib/tests/642026.c          | 19 ++++++++++++++-----
 glib/tests/fileutils.c       |  4 +++-
 5 files changed, 33 insertions(+), 16 deletions(-)
---