fix sigaltstack regression test to be more glibc-version tolerant

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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 76496c124cd64428b2a954b2b75db3c85f909e1b..4ebbf1ca636ee0ced364783158b9011b1199178f 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -9,7 +9,9 @@
 ##     strict EIP updating
 ##---------------------------------------------------------------------------
 
-noinst_SCRIPTS = filter_allocs filter_leak_check_size filter_stderr
+noinst_SCRIPTS = filter_allocs filter_leak_check_size filter_stderr \
+                 filter_stderr_backtrace
+
 
 EXTRA_DIST = \
        $(noinst_SCRIPTS) \

diff --git a/memcheck/tests/filter_stderr_backtrace b/memcheck/tests/filter_stderr_backtrace
new file mode 100755 (executable)
index 0000000..f5ba472
--- /dev/null
+++ b/memcheck/tests/filter_stderr_backtrace
@@ -0,0 +1,3 @@
+#! /bin/sh
+./filter_stderr |
+sed "/^   by 0x........: /d"

diff --git a/memcheck/tests/sigaltstack.stderr.exp b/memcheck/tests/sigaltstack.stderr.exp
index f74163a38a7c3426873ab958b43e60d23cf51a08..a93437cffda5972ea72a828f7afc9307072cd62c 100644 (file)
--- a/memcheck/tests/sigaltstack.stderr.exp
+++ b/memcheck/tests/sigaltstack.stderr.exp
@@ -3,9 +3,6 @@ calling sigaltstack, stack base is 0x........
 setting sigaction
 Syscall param sigaction(act) contains uninitialised or unaddressable byte(s)
    at 0x........: __libc_sigaction (...libc...)
-   by 0x........: main (sigaltstack.c:27)
-   by 0x........: __libc_start_main (...libc...)
-   by 0x........: (within /.../tests/sigaltstack)
    Address 0x........ is on thread 1's stack
 res = 0
 raising the signal

diff --git a/memcheck/tests/sigaltstack.vgtest b/memcheck/tests/sigaltstack.vgtest
index f61eeae3f2b56c8820c0ca517392f60d36652d06..2587d4c4abb8868186cdc510698b3491e342dbf3 100644 (file)
--- a/memcheck/tests/sigaltstack.vgtest
+++ b/memcheck/tests/sigaltstack.vgtest
@@ -1 +1,2 @@
 prog: sigaltstack
+stderr_filter: ./filter_stderr_backtrace