regtest: dhat/tests/user_histo1 filter out summary

Too system dependent.

diff --git a/dhat/tests/Makefile.am b/dhat/tests/Makefile.am
index bdc0f15688fb9cda7f3daa73a470eab12890bc50..818cc10d084a60de7b1a8725e7299c45b82b10d1 100644 (file)
--- 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 c872a9f8e7acc4dbc69349f956f9c8d3889a35a8..176a93e7a5b255b7c4effa76a8c24e7b691d7ba3 100755 (executable)
--- 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 8a96f6c9d84116cbf635870b2d3b28bf1ed0aa75..819765a19ff9893717d1158f8c26c523eafc7143 100644 (file)
--- 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 (file)
index b7fe054..0000000
--- 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