diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2014-12-08 17:08:38 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-12-08 19:54:01 +0100 |
| commit | 7dce7ee7fd06521e7a90275c7e6cb1f587064b7e (patch) | |
| tree | 1431bc4bd859fe2fea1f63544aa3bee447397f29 /m4/ax_valgrind_check.m4 | |
| parent | 5c2605d6c7188928a3cf593b4cea186349f19636 (diff) | |
| download | autoconf-archive-7dce7ee7fd06521e7a90275c7e6cb1f587064b7e.tar.gz | |
AX_VALGRIND_CHECK: Refactor a little to ensure log files are cleaned
Add the log files to MOSTLYCLEANFILES and take the opportunity to
refactor the code a little to reduce duplication for different Valgrind
tools.
Note that the valgrind_*_flags variables are necessary because the
sgcheck tool has an odd --tool=exp-sgcheck argument, rather than
--tool=sgcheck. This is because it is experimental. I want the
autoconf macro to consistently refer to it as sgcheck so that nothing
changes when it becomes non-experimental.
Diffstat (limited to 'm4/ax_valgrind_check.m4')
| -rw-r--r-- | m4/ax_valgrind_check.m4 | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/m4/ax_valgrind_check.m4 b/m4/ax_valgrind_check.m4 index ea36470..b4574fd 100644 --- a/m4/ax_valgrind_check.m4 +++ b/m4/ax_valgrind_check.m4 @@ -53,7 +53,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 1 +#serial 2 AC_DEFUN([AX_VALGRIND_CHECK],[ dnl Check for --enable-valgrind @@ -111,6 +111,15 @@ VALGRIND_helgrind_FLAGS ?= --history-level=approx VALGRIND_drd_FLAGS ?= VALGRIND_sgcheck_FLAGS ?= +# Internal use +valgrind_tools = memcheck helgrind drd sgcheck +valgrind_log_files = $(addprefix test-suite-,$(addsuffix .log,$(valgrind_tools))) + +valgrind_memcheck_flags = --tool=memcheck $(VALGRIND_memcheck_FLAGS) +valgrind_helgrind_flags = --tool=helgrind $(VALGRIND_helgrind_FLAGS) +valgrind_drd_flags = --tool=drd $(VALGRIND_drd_FLAGS) +valgrind_sgcheck_flags = --tool=exp-sgcheck $(VALGRIND_sgcheck_FLAGS) + valgrind_quiet = $(valgrind_quiet_$(V)) valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY)) valgrind_quiet_0 = --quiet @@ -118,18 +127,11 @@ valgrind_quiet_0 = --quiet # Use recursive makes in order to ignore errors during check check-valgrind: ifeq ($(VALGRIND_ENABLED),yes) -ifneq ($(VALGRIND_HAVE_TOOL_memcheck),) - -$(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-tool VALGRIND_TOOL=memcheck -endif -ifneq ($(VALGRIND_HAVE_TOOL_helgrind),) - -$(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-tool VALGRIND_TOOL=helgrind -endif -ifneq ($(VALGRIND_HAVE_TOOL_drd),) - -$(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-tool VALGRIND_TOOL=drd -endif -ifneq ($(VALGRIND_HAVE_TOOL_sgcheck),) - -$(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-tool VALGRIND_TOOL=sgcheck -endif + -$(foreach tool,$(valgrind_tools), \ + $(if $(VALGRIND_HAVE_TOOL_$(tool))$(VALGRIND_HAVE_TOOL_exp_$(tool)), \ + $(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-tool VALGRIND_TOOL=$(tool); \ + ) \ + ) else @echo "Need to reconfigure with --enable-valgrind" endif @@ -150,7 +152,7 @@ ifeq ($(VALGRIND_ENABLED),yes) $(MAKE) check-TESTS \ TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \ LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \ - LOG_FLAGS="--tool=$(VALGRIND_TOOL) $(VALGRIND_$(VALGRIND_TOOL)_FLAGS)" \ + LOG_FLAGS="$(valgrind_$(VALGRIND_TOOL)_flags)" \ TEST_SUITE_LOG=test-suite-$(VALGRIND_TOOL).log else @echo "Need to reconfigure with --enable-valgrind" @@ -159,6 +161,9 @@ endif DISTCHECK_CONFIGURE_FLAGS ?= DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind +MOSTLYCLEANFILES ?= +MOSTLYCLEANFILES += $(valgrind_log_files) + .PHONY: check-valgrind check-valgrind-tool ' |