summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-08-24 17:03:17 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-08-24 17:04:25 +0200
commit2b29963b53a5c5df48eecb0aef68cf0239e89706 (patch)
treea93c86c3ff9235598489dc8bbce60b2ca040bd4b /m4
parent3fa174ce6bfcfbc9ffd11ce4aa709d461550dbe6 (diff)
downloadgnutls-2b29963b53a5c5df48eecb0aef68cf0239e89706.tar.gz
m4: updated ax_code_coverage.m4 [ci skip]
This version fixes a bug which prevented including the branch coverage into output. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'm4')
-rw-r--r--m4/ax_code_coverage.m412
1 files changed, 6 insertions, 6 deletions
diff --git a/m4/ax_code_coverage.m4 b/m4/ax_code_coverage.m4
index 0934a44c5e..6484f03324 100644
--- a/m4/ax_code_coverage.m4
+++ b/m4/ax_code_coverage.m4
@@ -21,7 +21,7 @@
# Test also for gcov program and create GCOV variable that could be
# substituted.
#
-# Note that all optimisation flags in CFLAGS must be disabled when code
+# Note that all optimization flags in CFLAGS must be disabled when code
# coverage is enabled.
#
# Usage example:
@@ -75,7 +75,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#serial 21
+#serial 25
AC_DEFUN([AX_CODE_COVERAGE],[
dnl Check for --enable-code-coverage
@@ -218,9 +218,12 @@ CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\
$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
--rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
-CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULTS)
+CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
CODE_COVERAGE_IGNORE_PATTERN ?=
+GITIGNOREFILES ?=
+GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+
code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V))
code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY))
code_coverage_v_lcov_cap_0 = @echo " LCOV --capture"\
@@ -250,9 +253,6 @@ code-coverage-capture-hook:
'"$CODE_COVERAGE_RULES_CLEAN"'
-GITIGNOREFILES ?=
-GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-
A''M_DISTCHECK_CONFIGURE_FLAGS ?=
A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage