[glib: 2/2] Merge branch 'ci-coverage-include-baseline' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 7c8aaa7e0d7b7251590f84d49b1cda80c9fcb972
Merge: fde68be4b 69ae2f424
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Jul 6 12:28:52 2018 +0000

    Merge branch 'ci-coverage-include-baseline' into 'master'
    
    CI: Include coverage data of code which isn't executed by the test suite.
    
    See merge request GNOME/glib!152

 .gitlab-ci.yml                |  5 +++--
 .gitlab-ci/coverage-docker.sh |  4 +++-
 .gitlab-ci/test-msys2.sh      | 29 +++++++++++++++++++----------
 3 files changed, 25 insertions(+), 13 deletions(-)
---
diff --cc .gitlab-ci/test-msys2.sh
index 498cc27a6,b39a23db4..d8891e35b
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@@ -26,9 -32,10 +32,10 @@@ mkdir -p _coverag
  mkdir -p _ccache
  export CCACHE_BASEDIR="$(pwd)"
  export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 -pip3 install --upgrade --user meson
 +pip3 install --upgrade --user meson==0.47.0
  export PATH="$HOME/.local/bin:$PATH"
  export CFLAGS="-coverage -ftest-coverage -fprofile-arcs"
+ DIR="$(pwd)"
  
  meson --werror --buildtype debug _build
  cd _build