From 02260969746b582ba44c525d1b764060c5dd5d50 Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Wed, 18 Dec 2019 10:23:45 +0000 Subject: [PATCH 1/2] Suppress memory leak in libunbound to get test 125 passing on Bionic. --- .../125-valgrind-checks.test | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test index 4ec750d6..e35c72a3 100644 --- a/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test +++ b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test @@ -20,8 +20,20 @@ localhost. -S -X EOT +cat >125.supp < + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + fun:__gmp_default_allocate + fun:_nettle_gmp_alloc_limbs + fun:nettle_ecc_point_init + obj:/usr/lib/x86_64-linux-gnu/libunbound.so.2.5.6 +} +EOT ( - if ! valgrind -v --log-file=valgrind.log --leak-check=full --error-exitcode=1 --track-origins=yes "${GETDNS_QUERY}" -F queries -f "${TPKG_NAME}.ds" +dnssec_return_validation_chain + if ! valgrind -v --log-file=valgrind.log --suppressions=125.supp --leak-check=full --error-exitcode=1 --track-origins=yes "${GETDNS_QUERY}" -F queries -f "${TPKG_NAME}.ds" +dnssec_return_validation_chain then exit 1 fi From 489022dcb9896b7a6886d1a211830f40f889efe4 Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Wed, 18 Dec 2019 11:14:12 +0000 Subject: [PATCH 2/2] Some tests that use valgrind aren't flagged as such. Fix this. --- .../275-server-capabilities.tpkg/275-server-capabilities.dsc | 2 +- .../280-limit_outstanding_queries.dsc | 2 +- .../285-out_of_filedescriptors.dsc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/tpkg/275-server-capabilities.tpkg/275-server-capabilities.dsc b/src/test/tpkg/275-server-capabilities.tpkg/275-server-capabilities.dsc index a5665693..a5097a11 100644 --- a/src/test/tpkg/275-server-capabilities.tpkg/275-server-capabilities.dsc +++ b/src/test/tpkg/275-server-capabilities.tpkg/275-server-capabilities.dsc @@ -5,7 +5,7 @@ CreationDate: wo 19 apr 2017 10:01:58 CEST Maintainer: Hoda Rohani Category: Component: -CmdDepends: +CmdDepends: valgrind Depends: 200-stub-only-compile-install.tpkg Help: Pre: 275-server-capabilities.pre diff --git a/src/test/tpkg/280-limit_outstanding_queries.tpkg/280-limit_outstanding_queries.dsc b/src/test/tpkg/280-limit_outstanding_queries.tpkg/280-limit_outstanding_queries.dsc index 881977b7..8c08cb06 100644 --- a/src/test/tpkg/280-limit_outstanding_queries.tpkg/280-limit_outstanding_queries.dsc +++ b/src/test/tpkg/280-limit_outstanding_queries.tpkg/280-limit_outstanding_queries.dsc @@ -5,7 +5,7 @@ CreationDate: Tue Mar 14 10:43:45 CET 2017 Maintainer: Willem Toorop Category: Resource depletion Component: -CmdDepends: +CmdDepends: valgrind Depends: 200-stub-only-compile-install.tpkg Help: Pre: 280-limit_outstanding_queries.pre diff --git a/src/test/tpkg/285-out_of_filedescriptors.tpkg/285-out_of_filedescriptors.dsc b/src/test/tpkg/285-out_of_filedescriptors.tpkg/285-out_of_filedescriptors.dsc index b7322cc7..71983d67 100644 --- a/src/test/tpkg/285-out_of_filedescriptors.tpkg/285-out_of_filedescriptors.dsc +++ b/src/test/tpkg/285-out_of_filedescriptors.tpkg/285-out_of_filedescriptors.dsc @@ -5,7 +5,7 @@ CreationDate: ma 20 mrt 2017 15:17:45 CET Maintainer: Willem Toorop Category: Resource depletion Component: -CmdDepends: +CmdDepends: valgrind Depends: 200-stub-only-compile-install.tpkg Help: Pre: 285-out_of_filedescriptors.pre