[glib: 7/7] Merge branch 'w32' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 628c8ec0fdaf63e095ca191f7f0a4e1151503000
Merge: cffbd11437 743cd659f4
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Mar 23 16:44:16 2022 +0000

    Merge branch 'w32' into 'main'
    
    Various win32 tests fixes
    
    See merge request GNOME/glib!2569

 gio/glocalfileinfo.c     |  2 +-
 glib/tests/environment.c |  8 ++++--
 glib/tests/fileutils.c   |  4 +--
 glib/tests/io-channel.c  |  4 +++
 glib/tests/unicode.c     | 73 +++++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 83 insertions(+), 8 deletions(-)
---