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 (executable)
index 0000000..12b4d71
--- /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 (executable)
index 0000000..90a2b09
--- /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 9a02a8059c72adaf2ba336b20117d303f1e54ade..2add4997b3acceb856e41ff6afdb048d10ef875d 100644 (file)
--- 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 f87b79165adfb004f913871e26d9ec7dbb46035f..32fa5af674da8e5f89c50f3713d3cf54ee07e870 100644 (file)
--- 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 fb02374a0ef9cff3a8960a34496038abe5a0a15f..078d0c09f4dd36b7284ab7eb211a3e73315b09a5 100644 (file)
--- 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 97623ad5fa8f0fa8faae4dd6ce23644c6fed594e..078a025cc367b7b021e0e744156c8b2586aefaaa 100644 (file)
--- a/memcheck/tests/tronical.vgtest
+++ b/memcheck/tests/tronical.vgtest
@@ -1 +1,2 @@
 prog: tronical
+stderr_filter: filter_tronical