regtest: filter error address from dhat/tests/user_histo1

diff --git a/dhat/tests/Makefile.am b/dhat/tests/Makefile.am
index df36ef2b4bba406d63d16848adc2abb523604e93..818cc10d084a60de7b1a8725e7299c45b82b10d1 100644 (file)
--- 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 (executable)
index 0000000..c872a9f
--- /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 59206b17e3c5f57da83b8a5b55bcb7bd60bef1cc..8a96f6c9d84116cbf635870b2d3b28bf1ed0aa75 100644 (file)
--- 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 c44637a14af0987b36fc9416b37ebaa3957187f1..7c5d52e77d07a629c0a42df8588121a025eb9a5a 100644 (file)
--- 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