[glib: 2/2] Merge branch 'fix-mainloop-test' into 'master'

[Simon McVittie <smcv src gnome org>]

commit 361fed5d75805b66726145c1a1e07f90563ab9c7
Merge: 09799a8b2 88f36a1d6
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Tue Oct 30 16:43:13 2018 +0000

    Merge branch 'fix-mainloop-test' into 'master'
    
    mainloop-test: Fix race conditions
    
    Closes #1530
    
    See merge request GNOME/glib!429

 tests/mainloop-test.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)
---