|
From: <sv...@va...> - 2015-08-11 20:37:36
|
Author: florian
Date: Tue Aug 11 21:37:28 2015
New Revision: 15519
Log:
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.
Removed:
trunk/none/tests/amd64-linux/filter_minimal
trunk/none/tests/x86-linux/filter_minimal
Modified:
trunk/massif/tests/filter_verbose
trunk/none/tests/amd64-linux/Makefile.am
trunk/none/tests/amd64-linux/bug345887.vgtest
trunk/none/tests/amd64-linux/filter_stderr
trunk/none/tests/amd64-linux/map_32bits.vgtest
trunk/none/tests/x86-linux/Makefile.am
trunk/none/tests/x86-linux/bug345887.vgtest
trunk/tests/filter_stderr_basic
Modified: trunk/massif/tests/filter_verbose
==============================================================================
--- trunk/massif/tests/filter_verbose (original)
+++ trunk/massif/tests/filter_verbose Tue Aug 11 21:37:28 2015
@@ -7,6 +7,9 @@
$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" |
Modified: trunk/none/tests/amd64-linux/Makefile.am
==============================================================================
--- trunk/none/tests/amd64-linux/Makefile.am (original)
+++ trunk/none/tests/amd64-linux/Makefile.am Tue Aug 11 21:37:28 2015
@@ -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 \
Modified: trunk/none/tests/amd64-linux/bug345887.vgtest
==============================================================================
--- trunk/none/tests/amd64-linux/bug345887.vgtest (original)
+++ trunk/none/tests/amd64-linux/bug345887.vgtest Tue Aug 11 21:37:28 2015
@@ -1,4 +1,4 @@
prog: bug345887
vgopts: -q
-stderr_filter: filter_minimal
+stderr_filter: filter_stderr
cleanup: rm -f vgcore.*
Removed: trunk/none/tests/amd64-linux/filter_minimal
==============================================================================
--- trunk/none/tests/amd64-linux/filter_minimal (original)
+++ trunk/none/tests/amd64-linux/filter_minimal (removed)
@@ -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 --
Modified: trunk/none/tests/amd64-linux/filter_stderr
==============================================================================
--- trunk/none/tests/amd64-linux/filter_stderr (original)
+++ trunk/none/tests/amd64-linux/filter_stderr Tue Aug 11 21:37:28 2015
@@ -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
Modified: trunk/none/tests/amd64-linux/map_32bits.vgtest
==============================================================================
--- trunk/none/tests/amd64-linux/map_32bits.vgtest (original)
+++ trunk/none/tests/amd64-linux/map_32bits.vgtest Tue Aug 11 21:37:28 2015
@@ -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
Modified: trunk/none/tests/x86-linux/Makefile.am
==============================================================================
--- trunk/none/tests/x86-linux/Makefile.am (original)
+++ trunk/none/tests/x86-linux/Makefile.am Tue Aug 11 21:37:28 2015
@@ -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 \
Modified: trunk/none/tests/x86-linux/bug345887.vgtest
==============================================================================
--- trunk/none/tests/x86-linux/bug345887.vgtest (original)
+++ trunk/none/tests/x86-linux/bug345887.vgtest Tue Aug 11 21:37:28 2015
@@ -1,4 +1,4 @@
prog: bug345887
vgopts: -q
-stderr_filter: filter_minimal
+stderr_filter: filter_stderr
cleanup: rm -f vgcore.*
Removed: trunk/none/tests/x86-linux/filter_minimal
==============================================================================
--- trunk/none/tests/x86-linux/filter_minimal (original)
+++ trunk/none/tests/x86-linux/filter_minimal (removed)
@@ -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 --
Modified: trunk/tests/filter_stderr_basic
==============================================================================
--- trunk/tests/filter_stderr_basic (original)
+++ trunk/tests/filter_stderr_basic Tue Aug 11 21:37:28 2015
@@ -12,8 +12,9 @@
# 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...)
|