Fix up output filtering for cond_st so that the stacks are

actually present.

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

diff --git a/memcheck/tests/cond_ld.vgtest b/memcheck/tests/cond_ld.vgtest
index 25a6e98e3c1440cbe6d8edb0e764ac3795e2dee1..acc0bfe04f3d252a61b8a35e5178a9eedc70285c 100644 (file)
--- a/memcheck/tests/cond_ld.vgtest
+++ b/memcheck/tests/cond_ld.vgtest
@@ -1,3 +1,4 @@
 prog: cond_ld_st
 args: loads
 vgopts: -q
+stderr_filter_args: cond_ld_st

diff --git a/memcheck/tests/cond_st.stderr.exp-non-arm b/memcheck/tests/cond_st.stderr.exp-non-arm
index 0d52f5b1e40c706ff24a1786b556b96eb322ad19..7082ae864374465141c59341b25b774765d8eac1 100644 (file)
--- a/memcheck/tests/cond_st.stderr.exp-non-arm
+++ b/memcheck/tests/cond_st.stderr.exp-non-arm
@@ -22,10 +22,16 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 4
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:362)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:362)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -33,10 +39,16 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 5
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:364)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:364)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -44,10 +56,16 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 6
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:366)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:366)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -55,10 +73,16 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 7
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:368)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:368)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -66,7 +90,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 8
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:370)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -74,7 +101,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 9
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:372)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -82,7 +112,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 10
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:374)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -90,7 +123,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 11
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:376)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -98,13 +134,22 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 12
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:378)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:378)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:378)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -112,13 +157,22 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 13
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:380)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:380)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:380)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -126,13 +180,22 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 14
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:382)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:382)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:382)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -140,13 +203,22 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 15
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:384)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:384)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:384)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -234,7 +306,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 32
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:418)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -242,7 +317,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 33
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:420)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -250,7 +328,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 34
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:422)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -258,7 +339,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 35
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:424)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -266,13 +350,22 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 36
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:426)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:426)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:426)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -280,13 +373,22 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 37
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:428)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:428)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:428)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -294,13 +396,22 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 38
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:430)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:430)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:430)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -308,13 +419,22 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 39
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:432)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:432)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:432)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -322,10 +442,16 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 40
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:434)
+   by 0x........: main (cond_ld_st.c:641)
 
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:434)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -333,10 +459,16 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 41
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:436)
+   by 0x........: main (cond_ld_st.c:641)
 
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:436)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -344,10 +476,16 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 42
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:438)
+   by 0x........: main (cond_ld_st.c:641)
 
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:438)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -355,10 +493,16 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 43
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:440)
+   by 0x........: main (cond_ld_st.c:641)
 
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:440)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 2 errors
 PASS: correct result
@@ -366,16 +510,28 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 44
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:442)
+   by 0x........: main (cond_ld_st.c:641)
 
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:442)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:442)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:442)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 3 errors
 PASS: correct result
@@ -383,16 +539,28 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 45
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:444)
+   by 0x........: main (cond_ld_st.c:641)
 
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:444)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:444)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:444)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 3 errors
 PASS: correct result
@@ -400,16 +568,28 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 46
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:446)
+   by 0x........: main (cond_ld_st.c:641)
 
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:446)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:446)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:446)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 3 errors
 PASS: correct result
@@ -417,16 +597,28 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 47
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:448)
+   by 0x........: main (cond_ld_st.c:641)
 
 Use of uninitialised value of size 8
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:448)
+   by 0x........: main (cond_ld_st.c:641)
 
 Invalid write of size 4
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:448)
+   by 0x........: main (cond_ld_st.c:641)
  Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_replace_malloc.c:...)
-   ...
+   by 0x........: setup_test_data (cond_ld_st.c:257)
+   by 0x........: do_test_case (cond_ld_st.c:284)
+   by 0x........: do_test_case_steer (cond_ld_st.c:448)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 3 errors
 PASS: correct result
@@ -434,7 +626,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 48
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:450)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -442,7 +637,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 49
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:452)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -450,7 +648,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 50
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:454)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -458,7 +659,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 51
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:456)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -466,7 +670,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 52
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:458)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -474,7 +681,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 53
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:460)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -482,7 +692,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 54
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:462)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -490,7 +703,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 55
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:464)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -498,7 +714,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 56
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:466)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -506,7 +725,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 57
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:468)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -514,7 +736,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 58
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:470)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -522,7 +747,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 59
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:472)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -530,7 +758,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 60
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:474)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -538,7 +769,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 61
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:476)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -546,7 +780,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 62
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:478)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result
@@ -554,7 +791,10 @@ PASS: correct result
 -----------------------------------------------------------
 STORE CASE 63
 Conditional jump or move depends on uninitialised value(s)
-   ...
+   at 0x........: do_conditional_store32 (cond_ld_st.c:86)
+   by 0x........: do_test_case (cond_ld_st.c:319)
+   by 0x........: do_test_case_steer (cond_ld_st.c:480)
+   by 0x........: main (cond_ld_st.c:641)
 
 PASS: 1 errors
 PASS: correct result

diff --git a/memcheck/tests/cond_st.vgtest b/memcheck/tests/cond_st.vgtest
index 7b15ada3e1f1a4f4e1dffaed46a0c85e7c3ab0e8..2ccf00c4a7ba75719aaf06d69a9082f7fa3b8563 100644 (file)
--- a/memcheck/tests/cond_st.vgtest
+++ b/memcheck/tests/cond_st.vgtest
@@ -1,3 +1,4 @@
 prog: cond_ld_st
 args: stores
 vgopts: -q
+stderr_filter_args: cond_ld_st