Fixed broken regression tests:

  - For all except `trivialleak', expected output lines like this:

      by 0x........: __libc_start_main@@GLIBC_2.0 (...libc...)

    were changed to look like this:

      by 0x........: (within /.../tests/supp2)

    This change was caused by a change about 3 weeks ago, but we couldn't work
    out exactly which one.  It does not seem unreasonable, though.

  - For `malloc1' and `trivialleak', one of the line numbers changed -- they
    are now correct instead of off by one -- thanks to Jeremy F's recent patch
    which subtracts one from return addresses (for exactly this reason).

Now they all pass again except `tronical', as expected.

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

diff --git a/memcheck/tests/badfree.stderr.exp b/memcheck/tests/badfree.stderr.exp
index c17c3e6e32a717b7dae3d3230cc09a2dc92fc655..95616fae5d6fbf0e07fb542ca7fce4d46b53b455 100644 (file)
--- a/memcheck/tests/badfree.stderr.exp
+++ b/memcheck/tests/badfree.stderr.exp
@@ -3,14 +3,14 @@ Invalid free() / delete / delete[]
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (badfree.c:12)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/badfree)
+   by 0x........: (within /.../tests/badfree)
    Address 0x........ is not stack'd, malloc'd or free'd
 
 Invalid free() / delete / delete[]
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (badfree.c:15)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/badfree)
+   by 0x........: (within /.../tests/badfree)
    Address 0x........ is on thread 1's stack
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)

diff --git a/memcheck/tests/badjump.stderr.exp b/memcheck/tests/badjump.stderr.exp
index 1be7f70a20b005bff5086e279a5929567ef85476..b3394fa99cbfc32df5de733724cbc1f29412337f 100644 (file)
--- a/memcheck/tests/badjump.stderr.exp
+++ b/memcheck/tests/badjump.stderr.exp
@@ -2,5 +2,5 @@
 Jump to the invalid address stated on the next line
    at 0x........: ???
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __libc_start_main@@GLIBC_2.0 (...libc...)
+   by 0x........: (within /.../tests/badjump)
    Address 0x........ is not stack'd, malloc'd or free'd

diff --git a/memcheck/tests/buflen_check.stderr.exp b/memcheck/tests/buflen_check.stderr.exp
index 42fab531d465d55ac2db85b4c682e58c59d20aea..15557393d4e49d1a8dae885bce3d4845e7d13f7c 100644 (file)
--- a/memcheck/tests/buflen_check.stderr.exp
+++ b/memcheck/tests/buflen_check.stderr.exp
@@ -2,13 +2,13 @@
 Syscall param socketcall.getsockname(name) contains unaddressable byte(s)
    at 0x........: getsockname (in /...libc...)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: socket@@GLIBC_2.0 (in /.../tests/buflen_check)
+   by 0x........: (within /.../tests/buflen_check)
    Address 0x........ is not stack'd, malloc'd or free'd
 
 Syscall param socketcall.getsockname(namelen_in) contains uninitialised or unaddressable byte(s)
    at 0x........: getsockname (in /...libc...)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: socket@@GLIBC_2.0 (in /.../tests/buflen_check)
+   by 0x........: (within /.../tests/buflen_check)
    Address 0x........ is not stack'd, malloc'd or free'd
 getsockname(1) failed
 getsockname(2) failed

diff --git a/memcheck/tests/clientperm.stderr.exp b/memcheck/tests/clientperm.stderr.exp
index 37a1379d54deed54512692ccf767bb9630081feb..11993809768468771018d48d876e5544a42cf1fe 100644 (file)
--- a/memcheck/tests/clientperm.stderr.exp
+++ b/memcheck/tests/clientperm.stderr.exp
@@ -2,12 +2,12 @@
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: main (clientperm.c:29)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: calloc@@GLIBC_2.0 (in /.../tests/clientperm)
+   by 0x........: (within /.../tests/clientperm)
 
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: main (clientperm.c:36)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: calloc@@GLIBC_2.0 (in /.../tests/clientperm)
+   by 0x........: (within /.../tests/clientperm)
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 100 bytes in 1 blocks.

diff --git a/memcheck/tests/doublefree.stderr.exp b/memcheck/tests/doublefree.stderr.exp
index 6f1e5b1e4cf7a3934ef1ee240bb099266bb9ebe4..c48312078c521431a2c4ff2df6d7538fd44e87df 100644 (file)
--- a/memcheck/tests/doublefree.stderr.exp
+++ b/memcheck/tests/doublefree.stderr.exp
@@ -3,12 +3,12 @@ Invalid free() / delete / delete[]
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (doublefree.c:10)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/doublefree)
+   by 0x........: (within /.../tests/doublefree)
    Address 0x........ is 0 bytes inside a block of size 177 free'd
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (doublefree.c:10)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/doublefree)
+   by 0x........: (within /.../tests/doublefree)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/fprw.stderr.exp b/memcheck/tests/fprw.stderr.exp
index 2a2186452061237e0ade29f8e95987a938054d40..53fcbdfd03e59eabcd8790159c6c1574bfeaf867 100644 (file)
--- a/memcheck/tests/fprw.stderr.exp
+++ b/memcheck/tests/fprw.stderr.exp
@@ -2,79 +2,79 @@
 Use of uninitialised value of size 8
    at 0x........: main (fprw.c:14)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
 
 Use of uninitialised value of size 4
    at 0x........: main (fprw.c:15)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
 
 Use of uninitialised value of size 8
    at 0x........: main (fprw.c:16)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
 
 Use of uninitialised value of size 4
    at 0x........: main (fprw.c:17)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
 
 Invalid read of size 8
    at 0x........: main (fprw.c:20)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
    Address 0x........ is 0 bytes inside a block of size 8 free'd
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (fprw.c:18)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
 
 Invalid write of size 8
    at 0x........: main (fprw.c:20)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
    Address 0x........ is 0 bytes inside a block of size 8 free'd
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (fprw.c:18)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
 
 Invalid read of size 4
    at 0x........: main (fprw.c:21)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
    Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (fprw.c:19)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
 
 Invalid write of size 4
    at 0x........: main (fprw.c:21)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
    Address 0x........ is 0 bytes inside a block of size 4 free'd
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (fprw.c:19)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
 
 Invalid free() / delete / delete[]
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (fprw.c:22)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
    Address 0x........ is not stack'd, malloc'd or free'd
 
 Invalid write of size 8
    at 0x........: main (fprw.c:24)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
    Address 0x........ is 0 bytes inside a block of size 4 alloc'd
    at 0x........: malloc (vg_clientfuncs.c:...)
    by 0x........: main (fprw.c:23)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
+   by 0x........: (within /.../tests/fprw)
 
 ERROR SUMMARY: 10 errors from 10 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 4 bytes in 1 blocks.

diff --git a/memcheck/tests/fwrite.stderr.exp b/memcheck/tests/fwrite.stderr.exp
index 9c26de2afc90869aea7e27f7a05c862dfb3ad527..11b0eba8c6f98e960f1acc1f46faf84af6847a1a 100644 (file)
--- a/memcheck/tests/fwrite.stderr.exp
+++ b/memcheck/tests/fwrite.stderr.exp
@@ -2,12 +2,12 @@
 Syscall param write(buf) contains uninitialised or unaddressable byte(s)
    at 0x........: __libc_write (...libc...)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __libc_start_main@@GLIBC_2.0 (...libc...)
+   by 0x........: (within /.../tests/fwrite)
    Address 0x........ is 0 bytes inside a block of size 10 alloc'd
    at 0x........: malloc (vg_clientfuncs.c:...)
    by 0x........: main (fwrite.c:6)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __libc_start_main@@GLIBC_2.0 (...libc...)
+   by 0x........: (within /.../tests/fwrite)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 10 bytes in 1 blocks.

diff --git a/memcheck/tests/inline.stderr.exp b/memcheck/tests/inline.stderr.exp
index bb833013c034f3f4a9e7d497d56a08aeef996982..9d9f79a009f167a8db7f60fb72b0751dc3a95a29 100644 (file)
--- a/memcheck/tests/inline.stderr.exp
+++ b/memcheck/tests/inline.stderr.exp
@@ -3,12 +3,12 @@ Invalid read of size 4
    at 0x........: addemup (inline.c:10)
    by 0x........: main (inline.c:18)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: calloc@@GLIBC_2.0 (in /.../tests/inline)
+   by 0x........: (within /.../tests/inline)
    Address 0x........ is 0 bytes after a block of size 40 alloc'd
    at 0x........: calloc (vg_clientfuncs.c:...)
    by 0x........: main (inline.c:17)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: calloc@@GLIBC_2.0 (in /.../tests/inline)
+   by 0x........: (within /.../tests/inline)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 40 bytes in 1 blocks.

diff --git a/memcheck/tests/malloc1.stderr.exp b/memcheck/tests/malloc1.stderr.exp
index 0c501cf7c76e6d791086c30efc1f8542fdc6ee45..1571222deed2b098be61ae5908339e2efffe3b86 100644 (file)
--- a/memcheck/tests/malloc1.stderr.exp
+++ b/memcheck/tests/malloc1.stderr.exp
@@ -1,24 +1,24 @@
 
 Invalid write of size 1
    at 0x........: really (malloc1.c:20)
-   by 0x........: main (malloc1.c:10)
+   by 0x........: main (malloc1.c:9)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc1)
+   by 0x........: (within /.../tests/malloc1)
    Address 0x........ is 1 bytes inside a block of size 10 free'd
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: really (malloc1.c:19)
-   by 0x........: main (malloc1.c:10)
+   by 0x........: main (malloc1.c:9)
    by 0x........: __libc_start_main (...libc...)
 
 Invalid write of size 1
    at 0x........: really (malloc1.c:23)
-   by 0x........: main (malloc1.c:10)
+   by 0x........: main (malloc1.c:9)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc1)
+   by 0x........: (within /.../tests/malloc1)
    Address 0x........ is 1 bytes before a block of size 10 alloc'd
    at 0x........: malloc (vg_clientfuncs.c:...)
    by 0x........: really (malloc1.c:21)
-   by 0x........: main (malloc1.c:10)
+   by 0x........: main (malloc1.c:9)
    by 0x........: __libc_start_main (...libc...)
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)

diff --git a/memcheck/tests/malloc2.stderr.exp b/memcheck/tests/malloc2.stderr.exp
index 968c5f1af0e447eeb886b3de6adea7fd38608b5e..141a1ca16878594fc35128b597183e4272d204d7 100644 (file)
--- a/memcheck/tests/malloc2.stderr.exp
+++ b/memcheck/tests/malloc2.stderr.exp
@@ -2,23 +2,23 @@
 Invalid write of size 1
    at 0x........: main (malloc2.c:39)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc2)
+   by 0x........: (within /.../tests/malloc2)
    Address 0x........ is 0 bytes inside a block of size 429 free'd
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (malloc2.c:38)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc2)
+   by 0x........: (within /.../tests/malloc2)
 
 Invalid free() / delete / delete[]
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (malloc2.c:43)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc2)
+   by 0x........: (within /.../tests/malloc2)
    Address 0x........ is 0 bytes inside a block of size 429 free'd
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (malloc2.c:38)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc2)
+   by 0x........: (within /.../tests/malloc2)
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/manuel3.stderr.exp b/memcheck/tests/manuel3.stderr.exp
index 7a257c3047bff04d13c04c3cae060b187fc0e965..99fe9153592f9919168b6845c3597597adc5f547 100644 (file)
--- a/memcheck/tests/manuel3.stderr.exp
+++ b/memcheck/tests/manuel3.stderr.exp
@@ -3,7 +3,7 @@ Conditional jump or move depends on uninitialised value(s)
    at 0x........: gcc_cant_inline_me (manuel3.c:22)
    by 0x........: main (manuel3.c:14)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __libc_start_main@@GLIBC_2.0 (...libc...)
+   by 0x........: (within /.../tests/manuel3)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 4 bytes in 1 blocks.

diff --git a/memcheck/tests/memalign_test.stderr.exp b/memcheck/tests/memalign_test.stderr.exp
index 81378438b9f7a29dd890bf04344c871267aecb57..a23a9691d2358cf1fa6a61c091b12bcb64aeee74 100644 (file)
--- a/memcheck/tests/memalign_test.stderr.exp
+++ b/memcheck/tests/memalign_test.stderr.exp
@@ -3,12 +3,12 @@ Invalid free() / delete / delete[]
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (memalign_test.c:17)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: valloc@@GLIBC_2.0 (in /.../tests/memalign_test)
+   by 0x........: (within /.../tests/memalign_test)
    Address 0x........ is 0 bytes inside a block of size 111110 free'd
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (memalign_test.c:15)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: valloc@@GLIBC_2.0 (in /.../tests/memalign_test)
+   by 0x........: (within /.../tests/memalign_test)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/mismatches.stderr.exp b/memcheck/tests/mismatches.stderr.exp
index 765d8e9e7287ee1481e4bf128a1324bb896e93b2..d2164435f54531031af5cecbc69f771d6a899619 100644 (file)
--- a/memcheck/tests/mismatches.stderr.exp
+++ b/memcheck/tests/mismatches.stderr.exp
@@ -3,67 +3,67 @@ Mismatched free() / delete / delete []
    at 0x........: __builtin_delete (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:6)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
    Address 0x........ is 0 bytes inside a block of size 10 alloc'd
    at 0x........: malloc (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:5)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
 
 Mismatched free() / delete / delete []
    at 0x........: __builtin_vec_delete (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:8)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
    Address 0x........ is 0 bytes inside a block of size 10 alloc'd
    at 0x........: malloc (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:7)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
 
 Mismatched free() / delete / delete []
    at 0x........: __builtin_delete (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:13)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
    Address 0x........ is 0 bytes inside a block of size 40 alloc'd
    at 0x........: __builtin_vec_new (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:12)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
 
 Mismatched free() / delete / delete []
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:15)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
    Address 0x........ is 0 bytes inside a block of size 40 alloc'd
    at 0x........: __builtin_vec_new (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:14)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
 
 Mismatched free() / delete / delete []
    at 0x........: __builtin_vec_delete (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:20)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
    Address 0x........ is 0 bytes inside a block of size 4 alloc'd
    at 0x........: __builtin_new (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:19)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
 
 Mismatched free() / delete / delete []
    at 0x........: free (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:22)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
    Address 0x........ is 0 bytes inside a block of size 4 alloc'd
    at 0x........: __builtin_new (vg_clientfuncs.c:...)
    by 0x........: main (mismatches.cpp:21)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __builtin_new (in /.../tests/mismatches)
+   by 0x........: (within /.../tests/mismatches)
 
 ERROR SUMMARY: 6 errors from 6 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/nanoleak.stderr.exp b/memcheck/tests/nanoleak.stderr.exp
index 8dc3ae765b041154f9a571b6b5b8ba1e04a4273d..589bc8f633da9c8be0a79fdf504c0884375701bb 100644 (file)
--- a/memcheck/tests/nanoleak.stderr.exp
+++ b/memcheck/tests/nanoleak.stderr.exp
@@ -15,7 +15,7 @@ still reachable: 0 bytes in 0 blocks.
    at 0x........: malloc (vg_clientfuncs.c:...)
    by 0x........: main (nanoleak.c:6)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __libc_start_main@@GLIBC_2.0 (...libc...)
+   by 0x........: (within /.../tests/nanoleak)
 
 LEAK SUMMARY:
    definitely lost: 1000 bytes in 1 blocks.

diff --git a/memcheck/tests/sigaltstack.stderr.exp b/memcheck/tests/sigaltstack.stderr.exp
index 6b194c707a0e483a2b699f8086120dad761f1219..f74163a38a7c3426873ab958b43e60d23cf51a08 100644 (file)
--- a/memcheck/tests/sigaltstack.stderr.exp
+++ b/memcheck/tests/sigaltstack.stderr.exp
@@ -5,7 +5,7 @@ Syscall param sigaction(act) contains uninitialised or unaddressable byte(s)
    at 0x........: __libc_sigaction (...libc...)
    by 0x........: main (sigaltstack.c:27)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: sigaltstack@@GLIBC_2.0 (in /.../tests/sigaltstack)
+   by 0x........: (within /.../tests/sigaltstack)
    Address 0x........ is on thread 1's stack
 res = 0
 raising the signal

diff --git a/memcheck/tests/signal2.stderr.exp b/memcheck/tests/signal2.stderr.exp
index 6805e9e6e018efedbaf5cdc67c41a4f6400f2c49..b0e1f1c8e2a820191a1b15081f608b9c90bc6f3d 100644 (file)
--- a/memcheck/tests/signal2.stderr.exp
+++ b/memcheck/tests/signal2.stderr.exp
@@ -2,7 +2,7 @@
 Invalid write of size 4
    at 0x........: main (signal2.c:17)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: exit@@GLIBC_2.0 (in /.../tests/signal2)
+   by 0x........: (within /.../tests/signal2)
    Address 0x........ is not stack'd, malloc'd or free'd
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)

diff --git a/memcheck/tests/supp2.stderr.exp b/memcheck/tests/supp2.stderr.exp
index b245f048862dfed61c0dca98af0f8b55592800ff..4effd1cad299ef6480efd76553040455909dcd2a 100644 (file)
--- a/memcheck/tests/supp2.stderr.exp
+++ b/memcheck/tests/supp2.stderr.exp
@@ -2,7 +2,7 @@
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: main (supp.c:8)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: __libc_start_main@@GLIBC_2.0 (...libc...)
+   by 0x........: (within /.../tests/supp2)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/trivialleak.stderr.exp b/memcheck/tests/trivialleak.stderr.exp
index 12bb84bbd31dca841ca4b16382aba5a2adcc79f6..88cfa4ff5f1ec23b503192e4f6e8baabdfdd498a 100644 (file)
--- a/memcheck/tests/trivialleak.stderr.exp
+++ b/memcheck/tests/trivialleak.stderr.exp
@@ -14,7 +14,7 @@ still reachable: 0 bytes in 0 blocks.
 1000 bytes in 1000 blocks are definitely lost in loss record 1 of 1
    at 0x........: malloc (vg_clientfuncs.c:...)
    by 0x........: test (trivialleak.c:8)
-   by 0x........: main (trivialleak.c:13)
+   by 0x........: main (trivialleak.c:12)
    by 0x........: __libc_start_main (...libc...)
 
 LEAK SUMMARY:

diff --git a/memcheck/tests/weirdioctl.stderr.exp b/memcheck/tests/weirdioctl.stderr.exp
index 5d64354ba8978cded49601d06a97fc55151ea6db..b2963a34f95a3321d9b0ca450b4d158bbef4cdef 100644 (file)
--- a/memcheck/tests/weirdioctl.stderr.exp
+++ b/memcheck/tests/weirdioctl.stderr.exp
@@ -2,7 +2,7 @@
 Syscall param ioctl(TCSET{A,AW,AF}) contains uninitialised or unaddressable byte(s)
    at 0x........: __ioctl (in /...libc...)
    by 0x........: __libc_start_main (...libc...)
-   by 0x........: ioctl@@GLIBC_2.0 (in /.../tests/weirdioctl)
+   by 0x........: (within /.../tests/weirdioctl)
    Address 0x........ is on thread 1's stack
 
 ERROR SUMMARY: 2 errors from 1 contexts (suppressed: 0 from 0)