[gjs: 9/9] Merge branch 'august-maintenance' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 6102eab60336720ca3fd85a5ae5e37d1e8efc51d
Merge: 7bee7cf3 ab12e259
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Sep 2 00:07:18 2018 +0000

    Merge branch 'august-maintenance' into 'master'
    
    August maintenance
    
    See merge request GNOME/gjs!228

 Makefile-test.am                          |   6 +-
 configure.ac                              |   5 +-
 gjs/gjs.h                                 |   3 +-
 gjs/mem.h                                 |   4 +-
 installed-tests/js/testEverythingBasic.js |  19 +++++
 installed-tests/minijasmine.cpp           |   6 +-
 test/gjs-test-call-args.cpp               |   5 +-
 test/gjs-test-common.cpp                  |  45 ++++++++++++
 test/gjs-test-common.h                    |  31 ++++++++
 test/gjs-test-coverage.cpp                |   1 -
 test/gjs-test-utils.cpp                   | 118 +-----------------------------
 test/gjs-test-utils.h                     |   4 -
 test/gjs-tests.cpp                        |   5 --
 tools/apply-format                        |   6 +-
 tools/git-pre-commit-format               |  27 ++++++-
 15 files changed, 140 insertions(+), 145 deletions(-)
---