From b1b1e1b4f1710cf336d7bf61f50e759319e77580 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 21 Nov 2022 17:34:50 +0100 Subject: [PATCH] Restructure inline-function helpers for code coverage (cherry picked from commit fdad6ff7c7b40d18406e810866528ee18d5194e0) --- .gitlab-ci.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44356af58a..eb4086493c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1490,12 +1490,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