|
From: <sv...@va...> - 2012-09-24 21:37:09
|
philippe 2012-09-24 22:37:02 +0100 (Mon, 24 Sep 2012)
New Revision: 13014
Log:
Unbreak build on Mac_OS where __NR_mprotect is not defined.
The test is not executed on Darwin but should compile.
(based on fix suggestion by Rich Coe)
Modified files:
trunk/memcheck/tests/leak-segv-jmp.c
trunk/memcheck/tests/leak-segv-jmp.stderr.exp
Modified: trunk/memcheck/tests/leak-segv-jmp.stderr.exp (+4 -4)
===================================================================
--- trunk/memcheck/tests/leak-segv-jmp.stderr.exp 2012-09-24 22:12:41 +01:00 (rev 13013)
+++ trunk/memcheck/tests/leak-segv-jmp.stderr.exp 2012-09-24 22:37:02 +01:00 (rev 13014)
@@ -14,8 +14,8 @@
expecting a leak
1,000 bytes in 1 blocks are definitely lost in loss record ... of ...
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: f (leak-segv-jmp.c:167)
- by 0x........: main (leak-segv-jmp.c:214)
+ by 0x........: f (leak-segv-jmp.c:171)
+ by 0x........: main (leak-segv-jmp.c:218)
LEAK SUMMARY:
definitely lost: 1,000 bytes in 1 blocks
@@ -30,8 +30,8 @@
expecting a leak again
1,000 bytes in 1 blocks are definitely lost in loss record ... of ...
at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: f (leak-segv-jmp.c:167)
- by 0x........: main (leak-segv-jmp.c:214)
+ by 0x........: f (leak-segv-jmp.c:171)
+ by 0x........: main (leak-segv-jmp.c:218)
LEAK SUMMARY:
definitely lost: 1,000 bytes in 1 blocks
Modified: trunk/memcheck/tests/leak-segv-jmp.c (+4 -0)
===================================================================
--- trunk/memcheck/tests/leak-segv-jmp.c 2012-09-24 22:12:41 +01:00 (rev 13013)
+++ trunk/memcheck/tests/leak-segv-jmp.c 2012-09-24 22:37:02 +01:00 (rev 13014)
@@ -136,6 +136,10 @@
}
#else
+// Ensure the file compiles even if the syscall nr is not defined.
+#ifndef __NR_mprotect
+#define __NR_mprotect 0
+#endif
UWord do_syscall_WRK (UWord syscall_no,
UWord a1, UWord a2, UWord a3,
UWord a4, UWord a5, UWord a6
|