From 8e295e23a5020113410fa838f1879e3f7d7f558c Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@endlessos.org>
Date: Thu, 28 Apr 2022 11:57:45 +0100
Subject: [PATCH] =?UTF-8?q?build:=20Move=20lcovrc=20file=20to=20root=20so?=
 =?UTF-8?q?=20it=E2=80=99s=20picked=20up=20by=20Meson?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the lcovrc file to the root of the project, so that it’s picked up
by Meson when running `ninja coverage` locally.

See https://github.com/mesonbuild/meson/issues/4628

This won’t affect the code coverage run on the CI, since that explicitly
used the lcovrc file already.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
---
 .gitlab-ci.yml                | 4 ++--
 .gitlab-ci/coverage-docker.sh | 6 +++---
 .gitlab-ci/test-msys2.sh      | 4 ++--
 .gitlab-ci/lcovrc => .lcovrc  | 0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename .gitlab-ci/lcovrc => .lcovrc (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5c664576..1093b5cbe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,9 +95,9 @@ fedora-x86_64:
             _build
     - ninja -C _build
     - mkdir -p _coverage
-    - lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
+    - lcov --config-file .lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
     - .gitlab-ci/run-tests.sh
-    - lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
+    - lcov --config-file .lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
   artifacts:
     reports:
       junit: "_build/${CI_JOB_NAME}-report.xml"
diff --git a/.gitlab-ci/coverage-docker.sh b/.gitlab-ci/coverage-docker.sh
index a80b3beeb..df3273fa0 100755
--- a/.gitlab-ci/coverage-docker.sh
+++ b/.gitlab-ci/coverage-docker.sh
@@ -7,14 +7,14 @@ python3 ./.gitlab-ci/fixup-cov-paths.py _coverage/*.lcov
 
 for path in _coverage/*.lcov; do
     # Remove coverage from generated code in the build directory
-    lcov --config-file .gitlab-ci/lcovrc -r "${path}" '*/_build/*' -o "$(pwd)/${path}"
+    lcov --config-file .lcovrc -r "${path}" '*/_build/*' -o "$(pwd)/${path}"
     # Remove any coverage from system files
-    lcov --config-file .gitlab-ci/lcovrc -e "${path}" "$(pwd)/*" -o "$(pwd)/${path}"
+    lcov --config-file .lcovrc -e "${path}" "$(pwd)/*" -o "$(pwd)/${path}"
 done
 
 genhtml \
     --ignore-errors=source \
-    --config-file .gitlab-ci/lcovrc \
+    --config-file .lcovrc \
     _coverage/*.lcov \
     -o _coverage/coverage
 
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 0d1815593..ace412373 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -44,7 +44,7 @@ ninja
 
 lcov \
     --quiet \
-    --config-file "${DIR}"/.gitlab-ci/lcovrc \
+    --config-file "${DIR}"/.lcovrc \
     --directory "${DIR}/_build" \
     --capture \
     --initial \
@@ -61,7 +61,7 @@ python3 "${DIR}"/.gitlab-ci/meson-junit-report.py \
 
 lcov \
     --quiet \
-    --config-file "${DIR}"/.gitlab-ci/lcovrc \
+    --config-file "${DIR}"/.lcovrc \
     --directory "${DIR}/_build" \
     --capture \
     --output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov"
diff --git a/.gitlab-ci/lcovrc b/.lcovrc
similarity index 100%
rename from .gitlab-ci/lcovrc
rename to .lcovrc