From: Florian Krohm Date: Tue, 11 Aug 2015 20:37:28 +0000 (+0000) Subject: In filter_stderr_basic do not remove lines beginning with X-Git-Tag: svn/VALGRIND_3_11_0~138 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75381eec6e3443544187a8a4cc320dd3d90ce66a;p=thirdparty%2Fvalgrind.git 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 --- diff --git a/massif/tests/filter_verbose b/massif/tests/filter_verbose index 5f159c3ab9..745b521ea6 100755 --- a/massif/tests/filter_verbose +++ b/massif/tests/filter_verbose @@ -7,6 +7,9 @@ dir=`dirname $0` $dir/filter_stderr | +# Remove any --pid:0: strings (debuglog level zero output) +sed "/^--[0-9]\{1,7\}:0:*/d" | + # Only print lines that contain "Massif:". The -n means don't print any # lines by default, and the 'p' means do print those that match the pattern. sed -n "/Massif:/p" | diff --git a/none/tests/amd64-linux/Makefile.am b/none/tests/amd64-linux/Makefile.am index bfe27ab0bb..3e5a959aae 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 c0144230c6..e567c47836 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 e69398ce8a..0000000000 --- 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 587754a136..5bf2c9ca59 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 2d03f13f8b..2b7f3a04a6 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 4fa0fac2f5..2c86693591 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 c0144230c6..e567c47836 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 e69398ce8a..0000000000 --- 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 -- diff --git a/tests/filter_stderr_basic b/tests/filter_stderr_basic index b282a1d397..472cd8fb4d 100755 --- a/tests/filter_stderr_basic +++ b/tests/filter_stderr_basic @@ -12,8 +12,9 @@ dir=`dirname $0` # Remove ==pid== and --pid-- and **pid** strings perl -p -e 's/(==|--|\*\*)[0-9]{1,7}\1 //' | -# Remove any --pid:0: strings (debuglog level zero output) -sed "/^--[0-9]\{1,7\}:0:*/d" | +# Do NOT remove debug level output, i.e. lines beginning with --pid: +# Doing so would also remove asserts from the address space manager +# and we always to see those. # Remove "Command: line". (If wrapping occurs, it won't remove the # subsequent lines...)