From: Paul Floyd Date: Fri, 21 Apr 2023 21:10:51 +0000 (+0200) Subject: regtest: filter error address from dhat/tests/user_histo1 X-Git-Tag: VALGRIND_3_21_0~24 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=869e6e28b10bf01bf75feed4219699c9d896c3da;p=valgrind.git regtest: filter error address from dhat/tests/user_histo1 --- diff --git a/dhat/tests/Makefile.am b/dhat/tests/Makefile.am index df36ef2b4b..818cc10d08 100644 --- a/dhat/tests/Makefile.am +++ b/dhat/tests/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/Makefile.tool-tests.am -dist_noinst_SCRIPTS = filter_stderr filter_copy +dist_noinst_SCRIPTS = filter_stderr filter_copy filter_user_histo EXTRA_DIST = \ acc.stderr.exp acc.vgtest \ diff --git a/dhat/tests/filter_user_histo b/dhat/tests/filter_user_histo new file mode 100755 index 0000000000..c872a9f8e7 --- /dev/null +++ b/dhat/tests/filter_user_histo @@ -0,0 +1,9 @@ +#! /bin/sh + +# It's impossible to get exact matches for copy counts because even trivial C +# programs do a few memcpy/strcpy calls. So we allow some fuzzy matching. +# So we allow 1,000,000..1,009,999 bytes and 1,000..1,099 blocks. + +./filter_stderr "$@" | +sed -e "s/address for user histogram request not found .*/address for user histogram request not found/" + diff --git a/dhat/tests/user_histo1.stderr.exp b/dhat/tests/user_histo1.stderr.exp index 59206b17e3..8a96f6c9d8 100644 --- a/dhat/tests/user_histo1.stderr.exp +++ b/dhat/tests/user_histo1.stderr.exp @@ -1,5 +1,5 @@ Warning: request for user histogram of size 500 is smaller than the normal histogram limit, request ignored -Warning: address for user histogram request not found 55b2820 +Warning: address for user histogram request not found Warning: request for user histogram of size 100000 is larger than the maximum user request limit, request ignored Total: 102,500 bytes in 3 blocks At t-gmax: 100,500 bytes in 2 blocks diff --git a/dhat/tests/user_histo1.vgtest b/dhat/tests/user_histo1.vgtest index c44637a14a..7c5d52e77d 100644 --- a/dhat/tests/user_histo1.vgtest +++ b/dhat/tests/user_histo1.vgtest @@ -1,3 +1,4 @@ prog: user_histo1 vgopts: --dhat-out-file=dhat.out +stderr_filter: filter_user_histo cleanup: rm dhat.out