mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
build: update gnome-code-coverage.m4
Update gnome-code-coverage.m4 from gnome-common to fix some (harmless) error messages when coverage is disabled (bug 699943), and to add support for lcov 1.10.
This commit is contained in:
parent
bdf2bfbc3c
commit
9008730f89
|
@ -44,7 +44,7 @@ AC_DEFUN([GNOME_CODE_COVERAGE],[
|
|||
])
|
||||
|
||||
# List of supported lcov versions.
|
||||
lcov_version_list="1.6 1.7 1.8 1.9"
|
||||
lcov_version_list="1.6 1.7 1.8 1.9 1.10"
|
||||
|
||||
AC_CHECK_PROG([LCOV], [lcov], [lcov])
|
||||
AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
|
||||
|
@ -120,7 +120,7 @@ code_coverage_quiet_0 = --quiet
|
|||
|
||||
# Use recursive makes in order to ignore errors during check
|
||||
check-code-coverage:
|
||||
ifdef CODE_COVERAGE_ENABLED
|
||||
ifeq ($(CODE_COVERAGE_ENABLED),yes)
|
||||
-$(MAKE) $(AM_MAKEFLAGS) -k check
|
||||
$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
|
||||
else
|
||||
|
@ -129,7 +129,7 @@ endif
|
|||
|
||||
# Capture code coverage data
|
||||
code-coverage-capture: code-coverage-capture-hook
|
||||
ifdef CODE_COVERAGE_ENABLED
|
||||
ifeq ($(CODE_COVERAGE_ENABLED),yes)
|
||||
$(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS)
|
||||
$(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)"
|
||||
-@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
|
||||
|
@ -142,11 +142,13 @@ endif
|
|||
# Hook rule executed before code-coverage-capture, overridable by the user
|
||||
code-coverage-capture-hook:
|
||||
|
||||
ifeq ($(CODE_COVERAGE_ENABLED),yes)
|
||||
clean: code-coverage-clean
|
||||
code-coverage-clean:
|
||||
-$(LCOV) --directory $(top_builddir) -z
|
||||
rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
|
||||
rm -f *.gcno *.gcda *.gcov
|
||||
-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
|
||||
-find . -name "*.gcda" -o -name "*.gcov" -delete
|
||||
endif
|
||||
|
||||
GITIGNOREFILES ?=
|
||||
GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
|
||||
|
|
Loading…
Reference in a new issue