aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac10
-rw-r--r--doc/developer-notes.md4
-rw-r--r--doc/release-notes-30192.md6
3 files changed, 11 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 6af2c5aba8..04c7ecabf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,12 +238,6 @@ AC_ARG_ENABLE([lcov],
[use_lcov=$enableval],
[use_lcov=no])
-AC_ARG_ENABLE([lcov-branch-coverage],
- [AS_HELP_STRING([--enable-lcov-branch-coverage],
- [enable lcov testing branch coverage (default is no)])],
- [use_lcov_branch=yes],
- [use_lcov_branch=no])
-
AC_ARG_ENABLE([zmq],
[AS_HELP_STRING([--disable-zmq],
[disable ZMQ notifications])],
@@ -821,10 +815,8 @@ if test "$use_lcov" = "yes"; then
AX_CHECK_COMPILE_FLAG([--coverage],[CORE_CXXFLAGS="$CORE_CXXFLAGS --coverage"],
[AC_MSG_ERROR([lcov testing requested but --coverage flag does not work])])
CORE_CXXFLAGS="$CORE_CXXFLAGS -Og"
-fi
-if test "$use_lcov_branch" != "no"; then
- AC_SUBST(LCOV_OPTS, "$LCOV_OPTS --rc lcov_branch_coverage=1")
+ AC_SUBST(LCOV_OPTS)
fi
dnl Check for endianness
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 3458a71467..7e55962471 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -497,6 +497,10 @@ make cov
# unit and functional tests.
```
+Additional LCOV options can be specified using `LCOV_OPTS`, but may be dependant
+on the version of LCOV. For example, when using LCOV `2.x`, branch coverage can be
+enabled by setting `LCOV_OPTS="--rc branch_coverage=1"`, when configuring.
+
### Performance profiling with perf
Profiling is a good way to get a precise idea of where time is being spent in
diff --git a/doc/release-notes-30192.md b/doc/release-notes-30192.md
new file mode 100644
index 0000000000..2a6c17d455
--- /dev/null
+++ b/doc/release-notes-30192.md
@@ -0,0 +1,6 @@
+Build
+-----
+
+`--enable-lcov-branch-coverage` has been removed, given
+incompatibilities between lcov version 1 & 2. `LCOV_OPTS`
+should be used to set any options instead.