From 20bc479523c5f275f89bf1ceed07aed50248f616 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Tue, 18 Feb 2025 11:25:17 -0500
Subject: [PATCH] Build: Fix coverage targets.

* COVERAGE_DIR should be an absolute path so it doesn't get accidentally
  created outside of the source/build tree.

* Use long command line arguments to everything to make it a little more
  clear what these commands do.  We so rarely use any of these tools
  that no one remembers the short versions.

* Ignore unused excludes.  At some point, an unused exclude became an
  error which stops the build process.  Ignore those errors instead of
  trying to figure out what is and isn't used.

* Restrict code coverage to the lib/ directory in the main target.
  Previously, we were scanning everything and then going through and
  removing certain directories.  Instead, let's just scan the one thing
  we do care about.  This loses coverage checking of include/, but I'm
  okay with that.

* Add && before the genhtml commands.  This was previously broken - the
  line continuation made it part of the preceeding lcov command.
---
 devel/Makefile.am | 52 ++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/devel/Makefile.am b/devel/Makefile.am
index 2c42208eaa2..505f09b2d2c 100644
--- a/devel/Makefile.am
+++ b/devel/Makefile.am
@@ -196,37 +196,43 @@ cppcheck-clean:
 # Coverage/profiling
 #
 
-COVERAGE_DIR = $(top_builddir)/coverage
+COVERAGE_DIR = $(abs_top_builddir)/coverage
 
 # Check coverage of unit tests
 .PHONY: coverage
 coverage: coverage-partial-clean
-	cd $(top_builddir)						\
-	&& $(MAKE) $(AM_MAKEFLAGS)					\
-	&& lcov --no-external --exclude='*_test.c' -c -i -d .		\
-		-o pacemaker_base.info					\
-	&& $(MAKE) $(AM_MAKEFLAGS) check				\
-	&& lcov --no-external --exclude='*_test.c' -c -d .		\
-		-o pacemaker_test.info					\
-	&& lcov -a pacemaker_base.info -a pacemaker_test.info		\
-		-o pacemaker_total.info					\
-	&& lcov --remove pacemaker_total.info -o pacemaker_filtered.info\
-		"$(abs_top_builddir)/tools/*"				\
-		"$(abs_top_builddir)/daemons/*/*"			\
-		"$(abs_top_builddir)/replace/*"				\
-	genhtml $(top_builddir)/pacemaker_filtered.info -o $(COVERAGE_DIR) -s -t "Pacemaker code coverage"
+	cd $(top_builddir) 						\
+	&& $(MAKE) $(AM_MAKEFLAGS) 					\
+	&& lcov --capture --no-external --exclude='*_test.c' --initial 	\
+		--directory lib --ignore-errors=unused 			\
+		--output-file pacemaker_base.info 			\
+	&& $(MAKE) $(AM_MAKEFLAGS) check 				\
+	&& lcov --capture --no-external --exclude='*_test.c' 		\
+		--directory lib --ignore-errors=unused 			\
+		--output-file pacemaker_test.info 			\
+	&& lcov --add-tracefile pacemaker_base.info 			\
+		--add-tracefile pacemaker_test.info			\
+		--output-file pacemaker_total.info 			\
+	&& genhtml --output-directory $(COVERAGE_DIR) 			\
+		--show-details --title "Pacemaker library code coverage"\
+		pacemaker_total.info
 
 # Check coverage of CLI regression tests
 .PHONY: coverage-cts
 coverage-cts: coverage-partial-clean
-	cd $(top_builddir)						\
-	&& $(MAKE) $(AM_MAKEFLAGS)					\
-	&& lcov --no-external -c -i -d tools -o pacemaker_base.info	\
-	&& cts/cts-cli							\
-	&& lcov --no-external -c -d tools -o pacemaker_test.info	\
-	&& lcov -a pacemaker_base.info -a pacemaker_test.info		\
-		-o pacemaker_total.info
-	genhtml $(top_builddir)/pacemaker_total.info -o $(COVERAGE_DIR) -s
+	cd $(top_builddir) 						\
+	&& $(MAKE) $(AM_MAKEFLAGS) 					\
+	&& lcov --capture --no-external --initial --directory tools 	\
+		--output-file pacemaker_base.info 			\
+	&& cts/cts-cli 							\
+	&& lcov --capture --no-external --directory tools 		\
+		--output-file pacemaker_test.info 			\
+	&& lcov --add-tracefile pacemaker_base.info 			\
+		--add-tracefile pacemaker_test.info			\
+		--output-file pacemaker_total.info 			\
+	&& genhtml --output-directory $(COVERAGE_DIR) 			\
+		--show-details --title "Pacemaker tools code coverage" 	\
+		pacemaker_total.info
 
 # Remove coverage-related files that aren't needed across runs
 .PHONY: coverage-partial-clean