From: Nicholas Nethercote <njn@valgrind.org>
Date: Mon, 5 May 2003 09:23:12 +0000 (+0000)
Subject: Made 'tronical' and 'pushfpopf' less likely to fail by filtering their stderr
X-Git-Tag: svn/VALGRIND_2_0_0~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d43c0e3942ef4add8eb40a2af8b9f714baa237bf;p=thirdparty%2Fvalgrind.git

Made 'tronical' and 'pushfpopf' less likely to fail by filtering their stderr
output more vigorously.


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

diff --git a/memcheck/tests/filter_pushfpopf b/memcheck/tests/filter_pushfpopf
new file mode 100755
index 0000000000..12b4d71e43
--- /dev/null
+++ b/memcheck/tests/filter_pushfpopf
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+./filter_stderr | \
+sed "s/: fooble ([^)]*)/: fooble (...)/"
+
diff --git a/memcheck/tests/filter_tronical b/memcheck/tests/filter_tronical
new file mode 100755
index 0000000000..90a2b09abc
--- /dev/null
+++ b/memcheck/tests/filter_tronical
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+./filter_stderr | \
+sed "s/: get ([^)]*)/: get (...)/" | \
+sed "s/: main ([^)]*)/: main (...)/"
+
diff --git a/memcheck/tests/pushfpopf.stderr.exp b/memcheck/tests/pushfpopf.stderr.exp
index 9a02a8059c..2add4997b3 100644
--- a/memcheck/tests/pushfpopf.stderr.exp
+++ b/memcheck/tests/pushfpopf.stderr.exp
@@ -1,6 +1,6 @@
 
 Conditional jump or move depends on uninitialised value(s)
-   at 0x........: fooble (in /.../tests/pushfpopf)
+   at 0x........: fooble (...)
    by 0x........: main (pushfpopf_c.c:12)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: (within /.../tests/pushfpopf)
diff --git a/memcheck/tests/pushfpopf.vgtest b/memcheck/tests/pushfpopf.vgtest
index f87b79165a..32fa5af674 100644
--- a/memcheck/tests/pushfpopf.vgtest
+++ b/memcheck/tests/pushfpopf.vgtest
@@ -1 +1,2 @@
 prog: pushfpopf
+stderr_filter: filter_pushfpopf
diff --git a/memcheck/tests/tronical.stderr.exp b/memcheck/tests/tronical.stderr.exp
index fb02374a0e..078d0c09f4 100644
--- a/memcheck/tests/tronical.stderr.exp
+++ b/memcheck/tests/tronical.stderr.exp
@@ -1,7 +1,7 @@
 
 Conditional jump or move depends on uninitialised value(s)
-   at 0x........: get (in /.../tests/tronical)
-   by 0x........: main (in /.../tests/tronical)
+   at 0x........: get (...)
+   by 0x........: main (...)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: (within /.../tests/tronical)
 
diff --git a/memcheck/tests/tronical.vgtest b/memcheck/tests/tronical.vgtest
index 97623ad5fa..078a025cc3 100644
--- a/memcheck/tests/tronical.vgtest
+++ b/memcheck/tests/tronical.vgtest
@@ -1 +1,2 @@
 prog: tronical
+stderr_filter: filter_tronical