Organise the expected output files for the wrap8 testcase.
There is special behaviout on ppc64 only. Let the filenames
reflect that. At the same time update the ppc specific
output to what it is. The important thing here is that the
stack overflow is detected. Everything else is effectively a
don't care. Should line numbers and such differ in the future
that should be filtered out.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15012 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/tests/wrap8.stderr.exp b/memcheck/tests/wrap8.stderr.exp
index fb97266..e69de29 100644
--- a/memcheck/tests/wrap8.stderr.exp
+++ b/memcheck/tests/wrap8.stderr.exp
@@ -1,17 +0,0 @@
-Emulation fatal error -- Valgrind cannot continue:
- PPC64 function redirection stack overflow
- at 0x........: ???
- by 0x........: fact2 (wrap8.c:79)
- by 0x........: fact1 (wrap8.c:50)
- by 0x........: fact1 (wrap8.c:66)
- by 0x........: fact2 (wrap8.c:55)
- by 0x........: fact2 (wrap8.c:80)
- by 0x........: fact1 (wrap8.c:50)
- by 0x........: fact1 (wrap8.c:66)
- by 0x........: fact2 (wrap8.c:55)
- by 0x........: fact2 (wrap8.c:80)
- by 0x........: fact1 (wrap8.c:50)
- by 0x........: fact1 (wrap8.c:66)
-
-Valgrind has to exit now. Sorry.
-
diff --git a/memcheck/tests/wrap8.stderr.exp-ppc64 b/memcheck/tests/wrap8.stderr.exp-ppc64
new file mode 100644
index 0000000..c83bd47
--- /dev/null
+++ b/memcheck/tests/wrap8.stderr.exp-ppc64
@@ -0,0 +1,15 @@
+Emulation fatal error -- Valgrind cannot continue:
+ PPC64 function redirection stack overflow
+ ...
+ by 0x........: pre (wrap8.c:116)
+ by 0x........: fact2 (wrap8.c:77)
+ by 0x........: fact1 (wrap8.c:49)
+ by 0x........: fact1 (wrap8.c:65)
+ by 0x........: fact2 (wrap8.c:54)
+ by 0x........: fact2 (wrap8.c:79)
+ by 0x........: fact1 (wrap8.c:49)
+ by 0x........: fact1 (wrap8.c:65)
+ by 0x........: fact2 (wrap8.c:54)
+
+Valgrind has to exit now. Sorry.
+
diff --git a/memcheck/tests/wrap8.stderr.exp2 b/memcheck/tests/wrap8.stderr.exp2
deleted file mode 100644
index e69de29..0000000
--- a/memcheck/tests/wrap8.stderr.exp2
+++ /dev/null
diff --git a/memcheck/tests/wrap8.stdout.exp b/memcheck/tests/wrap8.stdout.exp
index e5c677b..e0afd09 100644
--- a/memcheck/tests/wrap8.stdout.exp
+++ b/memcheck/tests/wrap8.stdout.exp
@@ -15,3 +15,63 @@
in wrapper2-pre: fact(2)
in wrapper1-pre: fact(1)
in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper1-post: fact(3) = 6
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(4) = 32
+in wrapper1-post: fact(5) = 160
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(6) = 972
+in wrapper1-post: fact(7) = 6804
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(8) = 54448
+in wrapper1-post: fact(9) = 490032
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(10) = 4900340
+in wrapper1-post: fact(11) = 53903740
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(12) = 646844904
+in wrapper1-post: fact(13) = -180950840
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(14) = 1761655564
+in wrapper1-post: fact(15) = 655029684
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+fact1(15) = 655029686
+allocated 111 Lards
diff --git a/memcheck/tests/wrap8.stdout.exp-ppc64 b/memcheck/tests/wrap8.stdout.exp-ppc64
new file mode 100644
index 0000000..eceed33
--- /dev/null
+++ b/memcheck/tests/wrap8.stdout.exp-ppc64
@@ -0,0 +1,16 @@
+computing fact1(15)
+in wrapper1-pre: fact(15)
+in wrapper2-pre: fact(14)
+in wrapper1-pre: fact(13)
+in wrapper2-pre: fact(12)
+in wrapper1-pre: fact(11)
+in wrapper2-pre: fact(10)
+in wrapper1-pre: fact(9)
+in wrapper2-pre: fact(8)
+in wrapper1-pre: fact(7)
+in wrapper2-pre: fact(6)
+in wrapper1-pre: fact(5)
+in wrapper2-pre: fact(4)
+in wrapper1-pre: fact(3)
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
diff --git a/memcheck/tests/wrap8.stdout.exp2 b/memcheck/tests/wrap8.stdout.exp2
deleted file mode 100644
index e0afd09..0000000
--- a/memcheck/tests/wrap8.stdout.exp2
+++ /dev/null
@@ -1,77 +0,0 @@
-computing fact1(15)
-in wrapper1-pre: fact(15)
-in wrapper2-pre: fact(14)
-in wrapper1-pre: fact(13)
-in wrapper2-pre: fact(12)
-in wrapper1-pre: fact(11)
-in wrapper2-pre: fact(10)
-in wrapper1-pre: fact(9)
-in wrapper2-pre: fact(8)
-in wrapper1-pre: fact(7)
-in wrapper2-pre: fact(6)
-in wrapper1-pre: fact(5)
-in wrapper2-pre: fact(4)
-in wrapper1-pre: fact(3)
-in wrapper2-pre: fact(2)
-in wrapper1-pre: fact(1)
-in wrapper2-pre: fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper1-post: fact(3) = 6
-in wrapper2-pre: fact(2)
-in wrapper1-pre: fact(1)
-in wrapper2-pre: fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(4) = 32
-in wrapper1-post: fact(5) = 160
-in wrapper2-pre: fact(2)
-in wrapper1-pre: fact(1)
-in wrapper2-pre: fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(6) = 972
-in wrapper1-post: fact(7) = 6804
-in wrapper2-pre: fact(2)
-in wrapper1-pre: fact(1)
-in wrapper2-pre: fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(8) = 54448
-in wrapper1-post: fact(9) = 490032
-in wrapper2-pre: fact(2)
-in wrapper1-pre: fact(1)
-in wrapper2-pre: fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(10) = 4900340
-in wrapper1-post: fact(11) = 53903740
-in wrapper2-pre: fact(2)
-in wrapper1-pre: fact(1)
-in wrapper2-pre: fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(12) = 646844904
-in wrapper1-post: fact(13) = -180950840
-in wrapper2-pre: fact(2)
-in wrapper1-pre: fact(1)
-in wrapper2-pre: fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(14) = 1761655564
-in wrapper1-post: fact(15) = 655029684
-in wrapper2-pre: fact(2)
-in wrapper1-pre: fact(1)
-in wrapper2-pre: fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-fact1(15) = 655029686
-allocated 111 Lards
