From: Michal Nowak <mnowak@isc.org>
Date: Mon, 21 Nov 2022 16:34:50 +0000 (+0100)
Subject: Restructure inline-function helpers for code coverage
X-Git-Tag: v9.19.8~48^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdad6ff7c7b40d18406e810866528ee18d5194e0;p=thirdparty%2Fbind9.git

Restructure inline-function helpers for code coverage
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c16d3a7d7d..433907c31b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1445,12 +1445,9 @@ gcov:
     # Help gcovr process the nasty tricks in lib/dns/code.h, where we include C
     # source files from lib/dns/rdata/*/, using an even nastier trick.
     - find lib/dns/rdata/* -name "*.c" -execdir cp -f "{}" ../../ \;
-    # Help gcovr process inline functions in headers
-    - cp -f lib/dns/include/dns/*.h lib/dns/
-    - cp -f lib/dns/include/dns/*.h lib/ns/
-    - cp -f lib/isc/include/isc/*.h lib/isc/
-    - cp -f lib/isc/include/isc/*.h lib/dns/
-    - cp -f lib/isc/include/isc/*.h lib/ns/
+    # Help gcovr process inline functions in headers by copying all libdns and
+    # libisc headers to lib/{dns,isc,ns}/.
+    - for SRC in dns isc; do for DST in dns isc ns; do cp -f "lib/${SRC}/include/${SRC}"/*.h "lib/${DST}/"; done; done
     - find bin lib -maxdepth 1 -mindepth 1 -type d -exec cp -f lib/isc/include/isc/buffer.h "{}" \;
     - cp -f lib/isc/include/isc/buffer.h lib/isc/netmgr/buffer.h
     # Generate XML file in the Cobertura XML format suitable for use by GitLab