[gjs: 4/4] Merge branch 'update-gc-mozjs60' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 2fc22d24d55bc6cdffd0951a479d4c2d8fcd7915
Merge: 67a2caf6 22f429f3
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Oct 23 14:34:04 2018 +0000

    Merge branch 'update-gc-mozjs60' into 'master'
    
    engine: mozjs60 changes for GC sweeping tracking
    
    Closes #212
    
    See merge request GNOME/gjs!247

 gjs/engine.cpp                             |  2 +-
 installed-tests/scripts/testCommandLine.sh | 15 +++++++++++++++
 test/test-ci.sh                            |  4 +---
 3 files changed, 17 insertions(+), 4 deletions(-)
---