|
From: Paul F. <pa...@so...> - 2023-04-21 21:36:19
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=f5416b5edd9afa96f0096c0b63842aaa58b080e3 commit f5416b5edd9afa96f0096c0b63842aaa58b080e3 Author: Paul Floyd <pj...@wa...> Date: Fri Apr 21 23:35:37 2023 +0200 regtest: dhat/tests/user_histo1 filter out summary Too system dependent. Diff: --- dhat/tests/Makefile.am | 2 +- dhat/tests/filter_user_histo | 3 ++- dhat/tests/user_histo1.stderr.exp | 5 ----- dhat/tests/user_histo1.stderr.exp-gcc | 8 -------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dhat/tests/Makefile.am b/dhat/tests/Makefile.am index bdc0f15688..818cc10d08 100644 --- a/dhat/tests/Makefile.am +++ b/dhat/tests/Makefile.am @@ -13,7 +13,7 @@ EXTRA_DIST = \ sig.stderr.exp sig.vgtest \ single.stderr.exp single.vgtest \ user_histo1.stderr.exp user_histo1.vgtest \ - user_histo1.stdout.exp user_histo1.stderr.exp-gcc + user_histo1.stdout.exp check_PROGRAMS = \ acc \ diff --git a/dhat/tests/filter_user_histo b/dhat/tests/filter_user_histo index c872a9f8e7..176a93e7a5 100755 --- a/dhat/tests/filter_user_histo +++ b/dhat/tests/filter_user_histo @@ -5,5 +5,6 @@ # 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/" +sed -e "s/address for user histogram request not found .*/address for user histogram request not found/" | +grep Warning diff --git a/dhat/tests/user_histo1.stderr.exp b/dhat/tests/user_histo1.stderr.exp index 8a96f6c9d8..819765a19f 100644 --- a/dhat/tests/user_histo1.stderr.exp +++ b/dhat/tests/user_histo1.stderr.exp @@ -1,8 +1,3 @@ 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 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 -At t-end: 0 bytes in 0 blocks -Reads: 1,000 bytes -Writes: 102,520 bytes diff --git a/dhat/tests/user_histo1.stderr.exp-gcc b/dhat/tests/user_histo1.stderr.exp-gcc deleted file mode 100644 index b7fe054823..0000000000 --- a/dhat/tests/user_histo1.stderr.exp-gcc +++ /dev/null @@ -1,8 +0,0 @@ -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 -Warning: request for user histogram of size 100000 is larger than the maximum user request limit, request ignored -Total: 175,204 bytes in 4 blocks -At t-gmax: 173,204 bytes in 3 blocks -At t-end: 0 bytes in 0 blocks -Reads: 1,001 bytes -Writes: 102,536 bytes |