From: Dirk Mueller <daywalker@users.sourceforge.net>
Date: Thu, 24 Apr 2003 00:40:38 +0000 (+0000)
Subject: fix sigaltstack regression test to be more glibc-version tolerant
X-Git-Tag: svn/VALGRIND_2_0_0~207
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92ca30fb7feb9e5ed0eb705eb4030833552266b3;p=thirdparty%2Fvalgrind.git

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 76496c124c..4ebbf1ca63 100644
--- 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
index 0000000000..f5ba472f41
--- /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 f74163a38a..a93437cffd 100644
--- 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 f61eeae3f2..2587d4c4ab 100644
--- a/memcheck/tests/sigaltstack.vgtest
+++ b/memcheck/tests/sigaltstack.vgtest
@@ -1 +1,2 @@
 prog: sigaltstack
+stderr_filter: ./filter_stderr_backtrace