Filtered out the "More than 100 errors detected." message.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10527

diff --git a/drd/tests/filter_stderr b/drd/tests/filter_stderr
index c52d8c4054a6fd51449b14cf6fd5da54bb57e568..828f53937d6bb6e244e63641e659183d5f1216c4 100755 (executable)
--- a/drd/tests/filter_stderr
+++ b/drd/tests/filter_stderr
@@ -28,6 +28,10 @@ sed \
 -e "s/ (\([a-zA-Z_]*\.h\):[0-9]*)/ (\1:?)/" \
 -e "s/ (\([a-zA-Z_]*\.cpp\):[0-9]*)/ (\1:?)/" |
 
+# Remove the message that more than hundred errors have been detected
+# (consists of two lines) and also the empty line below it.
+awk '{if ($0 == "More than 100 errors detected.  Subsequent errors") {getline;getline} else print}' |
+
 # Anonymise addresses
 $dir/../../tests/filter_addresses
 

diff --git a/drd/tests/tc19_shadowmem.stderr.exp-32bit b/drd/tests/tc19_shadowmem.stderr.exp-32bit
index 9a5889776b7ba15d6230d15b2a9b357f33167c6e..0c2452a66883ae4ed2fc48ef598d76feeb8b9e4d 100644 (file)
--- a/drd/tests/tc19_shadowmem.stderr.exp-32bit
+++ b/drd/tests/tc19_shadowmem.stderr.exp-32bit
@@ -910,9 +910,6 @@ Address 0x........ is at offset 0 from 0x......... Allocation context:
    by 0x........: main (tc19_shadowmem.c:144)
 ---------- short gran, 1 .. 98, skip 1 ----------
 
-More than 100 errors detected.  Subsequent errors
-will still be recorded, but in less detail than before.
-
 Conflicting store by thread x at 0x........ size 2
    at 0x........: child16 (tc19_shadowmem.c:57)
    by 0x........: steer (tc19_shadowmem.c:290)

diff --git a/drd/tests/tc19_shadowmem.stderr.exp-64bit b/drd/tests/tc19_shadowmem.stderr.exp-64bit
index 7daac179d44d030378e02017836d41d196de5404..c98120ca9dc9df62bfa5f14dcf9c0ff26c97a54c 100644 (file)
--- a/drd/tests/tc19_shadowmem.stderr.exp-64bit
+++ b/drd/tests/tc19_shadowmem.stderr.exp-64bit
@@ -910,9 +910,6 @@ Address 0x........ is at offset 0 from 0x......... Allocation context:
    by 0x........: main (tc19_shadowmem.c:144)
 ---------- short gran, 1 .. 98, skip 1 ----------
 
-More than 100 errors detected.  Subsequent errors
-will still be recorded, but in less detail than before.
-
 Conflicting store by thread x at 0x........ size 2
    at 0x........: child16 (tc19_shadowmem.c:57)
    by 0x........: steer (tc19_shadowmem.c:290)