[glib: 2/2] Merge branch 'w32-gio-tests-enable' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit dbe0572d57036f90c89210d33c92fc7cf9aac3ab
Merge: 3f10c8b05 ad3694b82
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Sep 12 22:42:16 2018 +0000

    Merge branch 'w32-gio-tests-enable' into 'master'
    
    Enable GIO tests on Windows
    
    See merge request GNOME/glib!312

 gio/meson.build                   |  5 +----
 gio/tests/g-file-info.c           |  5 +++--
 gio/tests/gdbus-serialization.c   |  2 ++
 gio/tests/gdbus-tests.c           |  2 ++
 gio/tests/meson.build             | 44 +++++++++++++++++++++------------------
 gio/tests/modules/test-module-a.c |  2 ++
 gio/tests/modules/test-module-b.c |  2 ++
 gio/tests/readwrite.c             |  3 +++
 8 files changed, 39 insertions(+), 26 deletions(-)
---