Try to fix this test case.

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

diff --git a/memcheck/tests/x86/scalar.c b/memcheck/tests/x86/scalar.c
index b5e8e734f7f2cbeedc6cf9cddc62dcc1106c1830..c874ee1c54686f36a77a757dc163ae3c5058ec36 100644 (file)
--- a/memcheck/tests/x86/scalar.c
+++ b/memcheck/tests/x86/scalar.c
@@ -317,7 +317,7 @@ int main(void)
 
    // __NR_sigaction 67
    GO(__NR_sigaction, "3s 2m");
-   SY(__NR_sigaction, x0, x0, x0+1); FAIL;
+   SY(__NR_sigaction, x0, x0+&px[1], x0+&px[1]); FAIL;
 
    // __NR_sgetmask 68 sys_sgetmask()
    GO(__NR_sgetmask, "n/a");

diff --git a/memcheck/tests/x86/scalar.stderr.exp b/memcheck/tests/x86/scalar.stderr.exp
index 3dbeb7de8f9fb9e00e8e8df214cc0171b80b67b4..bf468f72a1695496b2d10d14534142b07d5c0d01 100644 (file)
--- a/memcheck/tests/x86/scalar.stderr.exp
+++ b/memcheck/tests/x86/scalar.stderr.exp
@@ -711,7 +711,7 @@ Syscall param fcntl(arg) contains uninitialised byte(s)
 
 Syscall param fcntl(lock) contains uninitialised byte(s)
    at 0x........: syscall (in /...libc...)
-   by 0x........: __libc_start_main (...libc...)
+   by 0x........: __libc_start_main (in /...libc...)
    by 0x........: ...
 -----------------------------------------------------
  56:            __NR_mpx ni
@@ -805,13 +805,17 @@ Syscall param sigaction(act) points to unaddressable byte(s)
    at 0x........: syscall (in /...libc...)
    by 0x........: __libc_start_main (in /...libc...)
    by 0x........: ...
- Address 0x........ is not stack'd, malloc'd or (recently) free'd
+ 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)
 
 Syscall param sigaction(oldact) points to unaddressable byte(s)
    at 0x........: syscall (in /...libc...)
    by 0x........: __libc_start_main (in /...libc...)
    by 0x........: ...
- Address 0x........ is not stack'd, malloc'd or (recently) free'd
+ 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)
 -----------------------------------------------------
  68:       __NR_sgetmask n/a
 -----------------------------------------------------
@@ -1668,7 +1672,7 @@ Syscall param sigprocmask(set) points to unaddressable byte(s)
    by 0x........: ...
  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:20)
+   by 0x........: main (scalar.c:24)
 
 Syscall param sigprocmask(oldset) points to unaddressable byte(s)
    at 0x........: syscall (in /...libc...)
@@ -1676,7 +1680,7 @@ Syscall param sigprocmask(oldset) points to unaddressable byte(s)
    by 0x........: ...
  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:20)
+   by 0x........: main (scalar.c:24)
 -----------------------------------------------------
 127:  __NR_create_module ni
 -----------------------------------------------------
@@ -3340,7 +3344,7 @@ Syscall param fcntl64(arg) contains uninitialised byte(s)
 
 Syscall param fcntl64(lock) contains uninitialised byte(s)
    at 0x........: syscall (in /...libc...)
-   by 0x........: __libc_start_main (...libc...)
+   by 0x........: __libc_start_main (in /...libc...)
    by 0x........: ...
 -----------------------------------------------------
 222:                 222 ni