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

[Philip Chimento <pchimento src gnome org>]

commit 3f6bc1e47bee075087f7ce1128074763b1682678
Merge: 72c2af6b 42fb9b4a
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Aug 17 02:49:37 2019 +0000

    Merge branch 'fix-test' into 'master'
    
    tests: Move Cairo-based GIMarshallingTests test to testCairo
    
    Unreviewed, pushing to fix breakage from conflicting merge requests.
    
    See merge request GNOME/gjs!332

 installed-tests/js/testCairo.js         | 11 ++++++++---
 installed-tests/js/testGIMarshalling.js | 19 +++----------------
 2 files changed, 11 insertions(+), 19 deletions(-)
---