|
From: <sv...@va...> - 2006-01-18 04:20:07
|
Author: sewardj
Date: 2006-01-18 04:20:04 +0000 (Wed, 18 Jan 2006)
New Revision: 5547
Log:
To reduce the endless nuisance of multiple different names for "the
frame below main()" screwing up the testsuite, change all known
incarnations of said into a single name, "(below main)".
Modified:
trunk/coregrind/m_demangle/demangle.c
trunk/memcheck/tests/badjump.stderr.exp
trunk/memcheck/tests/badjump2.stderr.exp
Modified: trunk/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
--- trunk/coregrind/m_demangle/demangle.c 2006-01-18 04:17:18 UTC (rev 55=
46)
+++ trunk/coregrind/m_demangle/demangle.c 2006-01-18 04:20:04 UTC (rev 55=
47)
@@ -90,6 +90,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);
+
# undef N_ZBUF
}
=20
Modified: trunk/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
--- trunk/memcheck/tests/badjump.stderr.exp 2006-01-18 04:17:18 UTC (rev =
5546)
+++ trunk/memcheck/tests/badjump.stderr.exp 2006-01-18 04:20:04 UTC (rev =
5547)
@@ -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: trunk/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
--- trunk/memcheck/tests/badjump2.stderr.exp 2006-01-18 04:17:18 UTC (rev=
5546)
+++ trunk/memcheck/tests/badjump2.stderr.exp 2006-01-18 04:20:04 UTC (rev=
5547)
@@ -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
|