[glib: 6/6] Merge branch '1930-bookmark-file-test-race' into 'master'

[Simon McVittie <smcv src gnome org>]

commit 29772c30eb3a784c8977548fdde941a415044a16
Merge: 963786f60 422feb743
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Tue Nov 5 10:58:30 2019 +0000

    Merge branch '1930-bookmark-file-test-race' into 'master'
    
    Fix race conditions in bookmarkfile test
    
    Closes #1930
    
    See merge request GNOME/glib!1217

 glib/gbookmarkfile.c      |  15 ++++--
 glib/tests/bookmarkfile.c | 123 +++++++++++++++++++++++++++-------------------
 2 files changed, 84 insertions(+), 54 deletions(-)
---