From 17b64f0bab8b27365ae75fc2660ef8a78777384d Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Wed, 6 Sep 2023 11:04:42 +0200 Subject: [PATCH] Test: grep \ in internal usecase test, valgrind exceptions for newer version --- test/test_restconf_internal_usecases.sh | 3 ++- test/valgrind-clixon.supp | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/test/test_restconf_internal_usecases.sh b/test/test_restconf_internal_usecases.sh index dbffe615..b857e57d 100755 --- a/test/test_restconf_internal_usecases.sh +++ b/test/test_restconf_internal_usecases.sh @@ -131,7 +131,8 @@ EOF fi if $active; then - expect="^$activeClixon RESTCONF process/.*/clixon_restconf -f $cfg -D [0-9] .*$status20[0-9][0-9]\-[0-9][0-9]\-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9]*Z$pid$" + # \- causes problems on some(alpine) + expect="^$activeClixon RESTCONF process/.*/clixon_restconf -f $cfg -D [0-9] .*$status20[0-9][0-9].[0-9][0-9].[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9]*Z$pid$" else # inactive, no startime or pid expect="^$activeClixon RESTCONF process/.*/clixon_restconf -f $cfg -D [0-9] .*$status$" diff --git a/test/valgrind-clixon.supp b/test/valgrind-clixon.supp index b7f6dd90..58be549a 100644 --- a/test/valgrind-clixon.supp +++ b/test/valgrind-clixon.supp @@ -3,6 +3,7 @@ Memcheck:Leak match-leak-kinds: reachable fun:* + fun:* fun:_dl_new_object } { @@ -25,6 +26,7 @@ Memcheck:Leak match-leak-kinds: reachable fun:* + fun:* fun:_dl_check_map_versions } { @@ -59,3 +61,18 @@ fun:* fun:_dl_close_worker } +# obsolete +{ + supp1x + Memcheck:Leak + match-leak-kinds: reachable + fun:* + fun:_dl_new_object +} +{ + supp2x + Memcheck:Leak + match-leak-kinds: reachable + fun:* + fun:expand_dynamic_string_token +}