|
From: <sv...@va...> - 2006-02-22 19:47:14
|
Author: dirk
Date: 2006-02-22 19:47:10 +0000 (Wed, 22 Feb 2006)
New Revision: 5692
Log:
backport the "(below main)" backtrace fix to reduce regression
failures on PPC32
Modified:
branches/VALGRIND_3_1_BRANCH/coregrind/m_demangle/demangle.c
branches/VALGRIND_3_1_BRANCH/memcheck/tests/badjump.stderr.exp
branches/VALGRIND_3_1_BRANCH/memcheck/tests/badjump2.stderr.exp
branches/VALGRIND_3_1_BRANCH/memcheck/tests/buflen_check.stderr.exp2
branches/VALGRIND_3_1_BRANCH/memcheck/tests/execve.stderr.exp2
branches/VALGRIND_3_1_BRANCH/memcheck/tests/execve2.stderr.exp2
branches/VALGRIND_3_1_BRANCH/memcheck/tests/fwrite.stderr.exp
branches/VALGRIND_3_1_BRANCH/memcheck/tests/x86/scalar_exit_group.stde=
rr.exp
branches/VALGRIND_3_1_BRANCH/memcheck/tests/xml1.stderr.exp
branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_creat.stderr.exp
branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_dup.stderr.exp
branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_dup2.stderr.exp
branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_fcntl.stderr.exp
branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_open.stderr.exp
branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_pipe.stderr.exp
branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_socketpair.stderr.exp
Modified: branches/VALGRIND_3_1_BRANCH/coregrind/m_demangle/demangle.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/coregrind/m_demangle/demangle.c 2006-02-=
22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/coregrind/m_demangle/demangle.c 2006-02-=
22 19:47:10 UTC (rev 5692)
@@ -58,6 +58,13 @@
// does leak. But, we can't do much about it, and it's not a disaste=
r,
// so we just let it slide without aborting or telling the user.
=20
+ // Finally, to reduce the endless nuisance of multiple different name=
s=20
+ // for "the frame below main()" screwing up the testsuite, change all
+ // known incarnations of said into a single name, "(below main)".
+ if (0=3D=3DVG_(strcmp)("__libc_start_main", result)
+ || 0=3D=3DVG_(strcmp)("generic_start_main", result))
+ VG_(strncpy_safely)(result, "(below main)", 13);
+
VGP_POPCC(VgpDemangle);
}
=20
Modified: branches/VALGRIND_3_1_BRANCH/memcheck/tests/badjump.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/memcheck/tests/badjump.stderr.exp 2006-0=
2-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/memcheck/tests/badjump.stderr.exp 2006-0=
2-22 19:47:10 UTC (rev 5692)
@@ -1,13 +1,13 @@
=20
Jump to the invalid address stated on the next line
at 0x........: ???
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
Address 0x........ is not stack'd, malloc'd or (recently) free'd
=20
Process terminating with default action of signal 11 (SIGSEGV)
Access not within mapped region at address 0x........
at 0x........: ???
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Modified: branches/VALGRIND_3_1_BRANCH/memcheck/tests/badjump2.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/memcheck/tests/badjump2.stderr.exp 2006-=
02-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/memcheck/tests/badjump2.stderr.exp 2006-=
02-22 19:47:10 UTC (rev 5692)
@@ -1,5 +1,5 @@
Jump to the invalid address stated on the next line
at 0x........: ???
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
Address 0x........ is not stack'd, malloc'd or (recently) free'd
Signal caught, as expected
Modified: branches/VALGRIND_3_1_BRANCH/memcheck/tests/buflen_check.stderr=
.exp2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/memcheck/tests/buflen_check.stderr.exp2 =
2006-02-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/memcheck/tests/buflen_check.stderr.exp2 =
2006-02-22 19:47:10 UTC (rev 5692)
@@ -1,11 +1,11 @@
Syscall param socketcall.getsockname(name) points to unaddressable byte(=
s)
at 0x........: getsockname (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
Address 0x........ is not stack'd, malloc'd or (recently) free'd
=20
Syscall param socketcall.getsockname(namelen_in) points to unaddressable=
byte(s)
at 0x........: getsockname (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
Address 0x........ is not stack'd, malloc'd or (recently) free'd
getsockname(1) failed
getsockname(2) failed
Modified: branches/VALGRIND_3_1_BRANCH/memcheck/tests/execve.stderr.exp2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/memcheck/tests/execve.stderr.exp2 2006-0=
2-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/memcheck/tests/execve.stderr.exp2 2006-0=
2-22 19:47:10 UTC (rev 5692)
@@ -1,14 +1,14 @@
Syscall param execve(filename) points to unaddressable byte(s)
at 0x........: execve (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
Address 0x........ is not stack'd, malloc'd or (recently) free'd
=20
Syscall param execve(argv[i]) points to unaddressable byte(s)
at 0x........: execve (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
Address 0x........ is not stack'd, malloc'd or (recently) free'd
=20
Syscall param execve(envp[i]) points to unaddressable byte(s)
at 0x........: execve (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
Address 0x........ is not stack'd, malloc'd or (recently) free'd
Modified: branches/VALGRIND_3_1_BRANCH/memcheck/tests/execve2.stderr.exp2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/memcheck/tests/execve2.stderr.exp2 2006-=
02-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/memcheck/tests/execve2.stderr.exp2 2006-=
02-22 19:47:10 UTC (rev 5692)
@@ -1,4 +1,4 @@
Syscall param execve(filename) points to unaddressable byte(s)
at 0x........: execve (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
Address 0x........ is not stack'd, malloc'd or (recently) free'd
Modified: branches/VALGRIND_3_1_BRANCH/memcheck/tests/fwrite.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/memcheck/tests/fwrite.stderr.exp 2006-02=
-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/memcheck/tests/fwrite.stderr.exp 2006-02=
-22 19:47:10 UTC (rev 5692)
@@ -1,6 +1,6 @@
Syscall param write(buf) points to uninitialised byte(s)
at 0x........: write (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
Address 0x........ is 0 bytes inside a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (fwrite.c:7)
Modified: branches/VALGRIND_3_1_BRANCH/memcheck/tests/x86/scalar_exit_gro=
up.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/memcheck/tests/x86/scalar_exit_group.std=
err.exp 2006-02-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/memcheck/tests/x86/scalar_exit_group.std=
err.exp 2006-02-22 19:47:10 UTC (rev 5692)
@@ -3,4 +3,4 @@
-----------------------------------------------------
Syscall param exit_group(exit_code) contains uninitialised byte(s)
at 0x........: syscall (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
Modified: branches/VALGRIND_3_1_BRANCH/memcheck/tests/xml1.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/memcheck/tests/xml1.stderr.exp 2006-02-2=
2 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/memcheck/tests/xml1.stderr.exp 2006-02-2=
2 19:47:10 UTC (rev 5692)
@@ -351,7 +351,7 @@
<frame>
<ip>0x........</ip>
<obj>...</obj>
- <fn>__libc_start_main</fn>
+ <fn>(below main)</fn>
</frame>
</stack>
</error>
Modified: branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_creat.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_creat.stderr.exp 2006-=
02-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_creat.stderr.exp 2006-=
02-22 19:47:10 UTC (rev 5692)
@@ -4,7 +4,7 @@
Open file descriptor .: /tmp/file
=20
at 0x........: creat (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .: .
<inherited from parent>
Modified: branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_dup.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_dup.stderr.exp 2006-02=
-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_dup.stderr.exp 2006-02=
-22 19:47:10 UTC (rev 5692)
@@ -3,11 +3,11 @@
FILE DESCRIPTORS: 5 open at exit.
Open file descriptor .: /dev/null
at 0x........: dup (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .: /dev/null
at 0x........: open (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .: .
<inherited from parent>
Modified: branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_dup2.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_dup2.stderr.exp 2006-0=
2-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_dup2.stderr.exp 2006-0=
2-22 19:47:10 UTC (rev 5692)
@@ -3,15 +3,15 @@
FILE DESCRIPTORS: 6 open at exit.
Open file descriptor .: /dev/null
at 0x........: dup2 (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .: /dev/null
at 0x........: dup2 (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .: /dev/null
at 0x........: open (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .: .
<inherited from parent>
Modified: branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_fcntl.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_fcntl.stderr.exp 2006-=
02-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_fcntl.stderr.exp 2006-=
02-22 19:47:10 UTC (rev 5692)
@@ -7,7 +7,7 @@
=20
Open file descriptor .: /dev/null
at 0x........: open (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .: .
<inherited from parent>
Modified: branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_open.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_open.stderr.exp 2006-0=
2-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_open.stderr.exp 2006-0=
2-22 19:47:10 UTC (rev 5692)
@@ -3,7 +3,7 @@
FILE DESCRIPTORS: 4 open at exit.
Open file descriptor .: /dev/null
at 0x........: open (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .: .
<inherited from parent>
Modified: branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_pipe.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_pipe.stderr.exp 2006-0=
2-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_pipe.stderr.exp 2006-0=
2-22 19:47:10 UTC (rev 5692)
@@ -3,11 +3,11 @@
FILE DESCRIPTORS: 5 open at exit.
Open file descriptor .:
at 0x........: pipe (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .:
at 0x........: pipe (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .: .
<inherited from parent>
Modified: branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_socketpair.stder=
r.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_socketpair.stderr.exp =
2006-02-22 19:16:25 UTC (rev 5691)
+++ branches/VALGRIND_3_1_BRANCH/none/tests/fdleak_socketpair.stderr.exp =
2006-02-22 19:47:10 UTC (rev 5692)
@@ -3,11 +3,11 @@
FILE DESCRIPTORS: 5 open at exit.
Open AF_UNIX socket .: <unknown>
at 0x........: socketpair (in /...libc...)
- by 0x........: main (fdleak_socketpair.c:15)
+ by 0x........: (below main) (in /...libc...)
=20
Open AF_UNIX socket .: <unknown>
at 0x........: socketpair (in /...libc...)
- by 0x........: main (fdleak_socketpair.c:15)
+ by 0x........: (below main) (in /...libc...)
=20
Open file descriptor .: .
<inherited from parent>
|