From d1a865628b0b53ccd5528d13a8dbce8815bd0d30 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 9 Apr 2015 12:17:07 +0200 Subject: [PATCH] test: make valgrind suppressions file configurable Add a configure option --with-valgrind-suppressions=path to allow specifying a different suppressions file. (cherry picked from commit 4c9a8367742373d594894c6ed7009a505957874d) --- configure.ac | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8cd0b4207a..a56ef5bfe3 100644 --- a/configure.ac +++ b/configure.ac @@ -859,8 +859,16 @@ AS_IF([test "$with_valgrind" == "yes"], # Add conditionals and substitutions AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" != "no") AM_CONDITIONAL(REQUIRE_ROOT_TESTS, test "$enable_tests" == "root") +AC_ARG_WITH(valgrind-suppressions, AS_HELP_STRING([--with-valgrind-suppressions=path], [Use specific valgrind suppression file])) +if test "$with_valgrind" == no; then + with_valgrind_suppressions= +else + if test "$with_valgrind_suppressions" == ""; then + with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions' + fi +fi AS_IF([test "$with_valgrind" != "no"], - AC_SUBST(VALGRIND_RULES, 'TESTS_ENVIRONMENT = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" "$(top_srcdir)/valgrind.suppressions"'), + AC_SUBST(VALGRIND_RULES, 'TESTS_ENVIRONMENT = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions"), AC_SUBST(VALGRIND_RULES, [])) AM_CONDITIONAL(WITH_VALGRIND, test "${with_valgrind}" != "no") @@ -1084,7 +1092,7 @@ echo echo "Miscellaneous:" echo " documentation: $enable_gtk_doc" echo " tests: $enable_tests" -echo " valgrind: $with_valgrind" +echo " valgrind: $with_valgrind $with_valgrind_suppressions" echo " code coverage: $enable_code_coverage" echo " LTO: $enable_lto" echo