From: Julian Seward <jseward@acm.org>
Date: Mon, 12 Mar 2007 01:29:31 +0000 (+0000)
Subject: Add a custom stderr filter for memcheck/tests/amd64/defcfaexpr.
X-Git-Tag: svn/VALGRIND_3_3_0~322
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34454d546456225313a53703d0e9111568a4312f;p=thirdparty%2Fvalgrind.git

Add a custom stderr filter for memcheck/tests/amd64/defcfaexpr.


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

diff --git a/memcheck/tests/amd64/Makefile.am b/memcheck/tests/amd64/Makefile.am
index 69ce4205f4..3f5fa64310 100644
--- a/memcheck/tests/amd64/Makefile.am
+++ b/memcheck/tests/amd64/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 	bt_everything.stderr.exp bt_everything.stdout.exp \
 		bt_everything.vgtest \
 	bug132146.vgtest bug132146.stderr.exp bug132146.stdout.exp \
-	defcfaexpr.vgtest defcfaexpr.stderr.exp \
+	defcfaexpr.vgtest defcfaexpr.stderr.exp filter_defcfaexpr \
 	fxsave-amd64.vgtest fxsave-amd64.stdout.exp fxsave-amd64.stderr.exp \
 	int3-amd64.vgtest int3-amd64.stdout.exp int3-amd64.stderr.exp \
 	more_x87_fp.stderr.exp more_x87_fp.stdout.exp more_x87_fp.vgtest \
diff --git a/memcheck/tests/amd64/defcfaexpr.stderr.exp b/memcheck/tests/amd64/defcfaexpr.stderr.exp
index 7a24ccd1dc..f62bbaf303 100644
--- a/memcheck/tests/amd64/defcfaexpr.stderr.exp
+++ b/memcheck/tests/amd64/defcfaexpr.stderr.exp
@@ -1,5 +1,5 @@
 Conditional jump or move depends on uninitialised value(s)
-   at 0x........: bbb (in ...)
-   by 0x........: aaa (in ...)
-   by 0x........: aaa (in ...)
-   by 0x........: main (in ...)
+   at 0x........: bbb (bogus.S:0)
+   by 0x........: aaa (bogus.S:0)
+   by 0x........: aaa (bogus.S:0)
+   by 0x........: main (bogus.S:0)
diff --git a/memcheck/tests/amd64/defcfaexpr.vgtest b/memcheck/tests/amd64/defcfaexpr.vgtest
index 1e1008cc8a..2016f32a24 100644
--- a/memcheck/tests/amd64/defcfaexpr.vgtest
+++ b/memcheck/tests/amd64/defcfaexpr.vgtest
@@ -1,2 +1,3 @@
 prog: defcfaexpr
+stderr_filter: filter_defcfaexpr
 vgopts: -q
diff --git a/memcheck/tests/amd64/filter_defcfaexpr b/memcheck/tests/amd64/filter_defcfaexpr
new file mode 100755
index 0000000000..7fa1afee71
--- /dev/null
+++ b/memcheck/tests/amd64/filter_defcfaexpr
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+# change 
+#
+# ==6019==    at 0x400512: bbb (in 
+#           /home/sewardj/VgTRUNK/trunk/memcheck/tests/amd64/defcfaexpr)
+#
+# to
+#
+# ==6019==    at 0x400512: bbb (in bogus.S:0)
+#
+# and then to
+#
+# ==6019==    at 0x400512: bbb (bogus.S:0)
+#
+# Then the standard ./filter_stderr won't screw it up any more,
+# instead producing what we want, which is
+#
+#   at 0x........: bbb (bogus.S:0)
+#
+# where the important point is that the function name is intact.
+# since the point of this test is to check that V can unwind the
+# stack given the unusual CFAs describing it.
+
+
+sed "s/\/.*\/tests\/amd64\/defcfaexpr/bogus.S:0/" | \
+      sed "s/(in /(/" | \
+      ./filter_stderr