In filter_stderr_basic do not remove lines beginning with

--pid:
i.e. debug output. Asserts originating from the address space
manager look exactly like that and we do not want to filter those
out by default.
Remove some specialised filter scripts that are no longer needed
and update a few .vgtest files accordingly.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15519 a5019735-40e9-0310-863c-91ae7b9d1cf9

8 files changed, 7 insertions, 52 deletions

diff --git a/none/tests/amd64-linux/Makefile.am b/none/tests/amd64-linux/Makefile.am
index bfe27ab0b..3e5a959aa 100644
--- a/none/tests/amd64-linux/Makefile.am
+++ b/none/tests/amd64-linux/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.tool-tests.am
 
 dist_noinst_SCRIPTS = \
-	filter_stderr filter_minimal
+	filter_stderr
 
 EXTRA_DIST = \
 	bug345887.stderr.exp bug345887.vgtest \
diff --git a/none/tests/amd64-linux/bug345887.vgtest b/none/tests/amd64-linux/bug345887.vgtest
index c0144230c..e567c4783 100644
--- a/none/tests/amd64-linux/bug345887.vgtest
+++ b/none/tests/amd64-linux/bug345887.vgtest
@@ -1,4 +1,4 @@
 prog: bug345887
 vgopts: -q
-stderr_filter: filter_minimal
+stderr_filter: filter_stderr
 cleanup: rm -f vgcore.*
diff --git a/none/tests/amd64-linux/filter_minimal b/none/tests/amd64-linux/filter_minimal
deleted file mode 100755
index e69398ce8..000000000
--- a/none/tests/amd64-linux/filter_minimal
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-dir=`dirname $0`
-
-# Remove ==pid== and **pid** strings 
-perl -p -e 's/(==|\*\*)[0-9]{1,7}\1 //' |
-
-perl -p -e 's/0x[0-9A-Fa-f]+/0x......../g' |
-
-# Older bash versions print abnormal termination messages on the stderr
-# of the bash process. Newer bash versions redirect such messages properly.
-# Suppress any redirected abnormal termination messages. You can find the
-# complete list of messages in the bash source file siglist.c.
-perl -n -e 'print if !/^(Segmentation fault|Alarm clock|Aborted|Bus error)( \(core dumped\))?$/' |
-
-# Remove the size in "The main thread stack size..." message.
-sed "s/The main thread stack size used in this run was [0-9]*/The main thread stack size used in this run was .../"
-
-# NOTE: it is essential for the bug345887 testcase that the stderr
-#       filtering does *not* remove lines beginning with --
diff --git a/none/tests/amd64-linux/filter_stderr b/none/tests/amd64-linux/filter_stderr
index 587754a13..5bf2c9ca5 100755
--- a/none/tests/amd64-linux/filter_stderr
+++ b/none/tests/amd64-linux/filter_stderr
@@ -2,10 +2,5 @@
 
 dir=`dirname $0`
 
-# Remove ==pid== and --pid-- and **pid** strings 
-perl -p -e 's/(==|--|\*\*)[0-9]{1,7}\1 //' |
-
-perl -p -e 's/0x[0-9A-Fa-f]+/0x......../g'
-
-# NOTE: it is essential for the bug345887 testcase that the stderr
-#       filtering does *not* remove lines beginning with --
+$dir/../../../tests/filter_stderr_basic |
+$dir/../../../tests/filter_addresses
diff --git a/none/tests/amd64-linux/map_32bits.vgtest b/none/tests/amd64-linux/map_32bits.vgtest
index 2d03f13f8..2b7f3a04a 100644
--- a/none/tests/amd64-linux/map_32bits.vgtest
+++ b/none/tests/amd64-linux/map_32bits.vgtest
@@ -1,5 +1,5 @@
 prog: map_32bits
 # take a big aspacemgr minaddr, to quickly reach the 2GB limit
 vgopts: -q --aspace-minaddr=0x7ff60000
-stderr_filter: filter_minimal
+stderr_filter: filter_stderr
 
diff --git a/none/tests/x86-linux/Makefile.am b/none/tests/x86-linux/Makefile.am
index 4fa0fac2f..2c8669359 100644
--- a/none/tests/x86-linux/Makefile.am
+++ b/none/tests/x86-linux/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.tool-tests.am
 
 dist_noinst_SCRIPTS = \
-	filter_stderr filter_minimal
+	filter_stderr
 
 EXTRA_DIST = \
 	bug345887.stderr.exp bug345887.vgtest \
diff --git a/none/tests/x86-linux/bug345887.vgtest b/none/tests/x86-linux/bug345887.vgtest
index c0144230c..e567c4783 100644
--- a/none/tests/x86-linux/bug345887.vgtest
+++ b/none/tests/x86-linux/bug345887.vgtest
@@ -1,4 +1,4 @@
 prog: bug345887
 vgopts: -q
-stderr_filter: filter_minimal
+stderr_filter: filter_stderr
 cleanup: rm -f vgcore.*
diff --git a/none/tests/x86-linux/filter_minimal b/none/tests/x86-linux/filter_minimal
deleted file mode 100755
index e69398ce8..000000000
--- a/none/tests/x86-linux/filter_minimal
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-dir=`dirname $0`
-
-# Remove ==pid== and **pid** strings 
-perl -p -e 's/(==|\*\*)[0-9]{1,7}\1 //' |
-
-perl -p -e 's/0x[0-9A-Fa-f]+/0x......../g' |
-
-# Older bash versions print abnormal termination messages on the stderr
-# of the bash process. Newer bash versions redirect such messages properly.
-# Suppress any redirected abnormal termination messages. You can find the
-# complete list of messages in the bash source file siglist.c.
-perl -n -e 'print if !/^(Segmentation fault|Alarm clock|Aborted|Bus error)( \(core dumped\))?$/' |
-
-# Remove the size in "The main thread stack size..." message.
-sed "s/The main thread stack size used in this run was [0-9]*/The main thread stack size used in this run was .../"
-
-# NOTE: it is essential for the bug345887 testcase that the stderr
-#       filtering does *not* remove lines beginning with --