|
From: <sv...@va...> - 2005-09-27 19:46:49
|
Author: njn
Date: 2005-09-27 20:46:46 +0100 (Tue, 27 Sep 2005)
New Revision: 4790
Log:
Fix scalar and cmdline[12].
Modified:
trunk/memcheck/tests/x86/scalar.c
trunk/memcheck/tests/x86/scalar.stderr.exp
trunk/none/tests/cmdline1.stdout.exp
trunk/none/tests/cmdline2.stdout.exp
Modified: trunk/memcheck/tests/x86/scalar.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/memcheck/tests/x86/scalar.c 2005-09-27 19:20:21 UTC (rev 4789)
+++ trunk/memcheck/tests/x86/scalar.c 2005-09-27 19:46:46 UTC (rev 4790)
@@ -316,7 +316,7 @@
SY(__NR_setsid); SUCC_OR_FAIL;
=20
// __NR_sigaction 67
- GO(__NR_sigaction, "3s 2m");
+ GO(__NR_sigaction, "3s 4m");
SY(__NR_sigaction, x0, x0+&px[1], x0+&px[1]); FAIL;
=20
// __NR_sgetmask 68 sys_sgetmask()
@@ -762,7 +762,7 @@
//SY(__NR_rt_sigreturn); // (Not yet handled by Valgrind) FAIL;
=20
// __NR_rt_sigaction 174
- GO(__NR_rt_sigaction, "4s 2m");
+ GO(__NR_rt_sigaction, "4s 4m");
SY(__NR_rt_sigaction, x0, x0+&px[2], x0+&px[2], x0); FAIL;
=20
// __NR_rt_sigprocmask 175
Modified: trunk/memcheck/tests/x86/scalar.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/x86/scalar.stderr.exp 2005-09-27 19:20:21 UTC (r=
ev 4789)
+++ trunk/memcheck/tests/x86/scalar.stderr.exp 2005-09-27 19:46:46 UTC (r=
ev 4790)
@@ -782,7 +782,7 @@
66: __NR_setsid 0s 0m
-----------------------------------------------------
-----------------------------------------------------
- 67: __NR_sigaction 3s 2m
+ 67: __NR_sigaction 3s 4m
-----------------------------------------------------
=20
Syscall param sigaction(signum) contains uninitialised byte(s)
@@ -800,11 +800,7 @@
by 0x........: __libc_start_main (in /...libc...)
by 0x........: ...
=20
-<<<<<<< .working
Syscall param sigaction(act->sa_handler) points to unaddressable byte(s)
-=3D=3D=3D=3D=3D=3D=3D
-Syscall param rt_sigaction(act->sa_handler) points to unaddressable byte=
(s)
->>>>>>> .merge-right.r4787
at 0x........: syscall (in /...libc...)
by 0x........: __libc_start_main (in /...libc...)
by 0x........: ...
@@ -812,7 +808,6 @@
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (scalar.c:24)
=20
-<<<<<<< .working
Syscall param sigaction(act->sa_mask) points to unaddressable byte(s)
at 0x........: syscall (in /...libc...)
by 0x........: __libc_start_main (in /...libc...)
@@ -829,24 +824,6 @@
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (scalar.c:24)
=20
-=3D=3D=3D=3D=3D=3D=3D
-Syscall param rt_sigaction(act->sa_mask) points to unaddressable byte(s)
- at 0x........: syscall (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
- by 0x........: ...
- 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)
-
-Syscall param rt_sigaction(act->sa_flags) points to unaddressable byte(s=
)
- at 0x........: syscall (in /...libc...)
- by 0x........: __libc_start_main (in /...libc...)
- by 0x........: ...
- 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)
-
->>>>>>> .merge-right.r4787
Syscall param sigaction(oldact) points to unaddressable byte(s)
at 0x........: syscall (in /...libc...)
by 0x........: __libc_start_main (in /...libc...)
@@ -2416,7 +2393,7 @@
173: __NR_rt_sigreturn n/a
-----------------------------------------------------
-----------------------------------------------------
-174: __NR_rt_sigaction 4s 2m
+174: __NR_rt_sigaction 4s 4m
-----------------------------------------------------
=20
Syscall param rt_sigaction(signum) contains uninitialised byte(s)
@@ -2439,7 +2416,6 @@
by 0x........: __libc_start_main (in /...libc...)
by 0x........: ...
=20
-<<<<<<< .working
Syscall param rt_sigaction(act->sa_handler) points to unaddressable byte=
(s)
at 0x........: syscall (in /...libc...)
by 0x........: __libc_start_main (in /...libc...)
@@ -2454,8 +2430,6 @@
by 0x........: ...
Address 0x........ is not stack'd, malloc'd or (recently) free'd
=20
-=3D=3D=3D=3D=3D=3D=3D
->>>>>>> .merge-right.r4787
Syscall param rt_sigaction(act->sa_flags) points to unaddressable byte(s=
)
at 0x........: syscall (in /...libc...)
by 0x........: __libc_start_main (in /...libc...)
Modified: trunk/none/tests/cmdline1.stdout.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/none/tests/cmdline1.stdout.exp 2005-09-27 19:20:21 UTC (rev 478=
9)
+++ trunk/none/tests/cmdline1.stdout.exp 2005-09-27 19:46:46 UTC (rev 479=
0)
@@ -18,7 +18,8 @@
=20
uncommon user options for all Valgrind tools:
--run-libc-freeres=3Dno|yes free up glibc memory at exit? [yes]
- --weird-hacks=3Dhack1,hack2,... recognised hacks: lax-ioctls,ioctl-=
mmap [none]
+ --weird-hacks=3Dhack1,hack2,... known hacks: lax-ioctls,ioctl-mmap
+ enable-outer [none]
--pointercheck=3Dno|yes enforce client address space limits [yes=
]
--show-emwarns=3Dno|yes show warnings about emulation limits? [n=
o]
--smc-check=3Dnone|stack|all checks for self-modifying code: none,
Modified: trunk/none/tests/cmdline2.stdout.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/none/tests/cmdline2.stdout.exp 2005-09-27 19:20:21 UTC (rev 478=
9)
+++ trunk/none/tests/cmdline2.stdout.exp 2005-09-27 19:46:46 UTC (rev 479=
0)
@@ -18,7 +18,8 @@
=20
uncommon user options for all Valgrind tools:
--run-libc-freeres=3Dno|yes free up glibc memory at exit? [yes]
- --weird-hacks=3Dhack1,hack2,... recognised hacks: lax-ioctls,ioctl-=
mmap [none]
+ --weird-hacks=3Dhack1,hack2,... known hacks: lax-ioctls,ioctl-mmap
+ enable-outer [none]
--pointercheck=3Dno|yes enforce client address space limits [yes=
]
--show-emwarns=3Dno|yes show warnings about emulation limits? [n=
o]
--smc-check=3Dnone|stack|all checks for self-modifying code: none,
|