|
From: <sv...@va...> - 2009-05-07 23:24:02
|
Author: njn
Date: 2009-05-08 00:23:58 +0100 (Fri, 08 May 2009)
New Revision: 9794
Log:
Fix some minor test breakage on Linux.
Modified:
branches/DARWIN/helgrind/tests/filter_stderr
branches/DARWIN/memcheck/tests/x86-linux/scalar.stderr.exp
Modified: branches/DARWIN/helgrind/tests/filter_stderr
===================================================================
--- branches/DARWIN/helgrind/tests/filter_stderr 2009-05-07 23:08:10 UTC (rev 9793)
+++ branches/DARWIN/helgrind/tests/filter_stderr 2009-05-07 23:23:58 UTC (rev 9794)
@@ -47,7 +47,7 @@
# "pthread_create@GLIBC_", "do_clone", "clone", etc. So we cut all the
# "at"/"by" lines above "pthread_create@*". We also convert
# "pthread_create" into "pthread_create@*".
-perl -p -0 -e 's/(Thread #. was created\n)( (at|by)[^\n]*\n)*( by 0x........: pthread_create)(@\*)?( \(hg_intercepts.c:...\)\n)/$1 ...\n$4$5@*$6/gs' |
+perl -p -0 -e 's/(Thread #. was created\n)( (at|by)[^\n]*\n)*( by 0x........: pthread_create)(@\*)?( \(hg_intercepts.c:...\)\n)/$1 ...\n$4@*$6/gs' |
# Anything below "mythread_wrapper" in stack traces is unreliable,
# containing libc and libpthread stuff like start_thread, clone, etc. So we
Modified: branches/DARWIN/memcheck/tests/x86-linux/scalar.stderr.exp
===================================================================
--- branches/DARWIN/memcheck/tests/x86-linux/scalar.stderr.exp 2009-05-07 23:08:10 UTC (rev 9793)
+++ branches/DARWIN/memcheck/tests/x86-linux/scalar.stderr.exp 2009-05-07 23:23:58 UTC (rev 9794)
@@ -582,25 +582,25 @@
...
Address 0x........ is 0 bytes after a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: main (scalar.c:24)
+ by 0x........: main (scalar.c:28)
Syscall param sigaction(act->sa_mask) points to unaddressable byte(s)
...
Address 0x........ is 4 bytes after a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: main (scalar.c:24)
+ by 0x........: main (scalar.c:28)
Syscall param sigaction(act->sa_flags) points to unaddressable byte(s)
...
Address 0x........ is 8 bytes after a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: main (scalar.c:24)
+ by 0x........: main (scalar.c:28)
Syscall param sigaction(oldact) points to unaddressable byte(s)
...
Address 0x........ is 0 bytes after a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: main (scalar.c:24)
+ by 0x........: main (scalar.c:28)
-----------------------------------------------------
68: __NR_sgetmask n/a
-----------------------------------------------------
@@ -1224,13 +1224,13 @@
...
Address 0x........ is 0 bytes after a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: main (scalar.c:24)
+ by 0x........: main (scalar.c:28)
Syscall param sigprocmask(oldset) points to unaddressable byte(s)
...
Address 0x........ is 0 bytes after a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: main (scalar.c:24)
+ by 0x........: main (scalar.c:28)
-----------------------------------------------------
127: __NR_create_module ni
-----------------------------------------------------
@@ -1743,7 +1743,7 @@
...
Address 0x........ is 4 bytes after a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: main (scalar.c:24)
+ by 0x........: main (scalar.c:28)
Syscall param rt_sigaction(act->sa_mask) points to unaddressable byte(s)
...
@@ -1753,13 +1753,13 @@
...
Address 0x........ is 8 bytes after a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: main (scalar.c:24)
+ by 0x........: main (scalar.c:28)
Syscall param rt_sigaction(oldact) points to unaddressable byte(s)
...
Address 0x........ is 4 bytes after a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: main (scalar.c:24)
+ by 0x........: main (scalar.c:28)
-----------------------------------------------------
175: __NR_rt_sigprocmask 4s 2m
-----------------------------------------------------
|