From: Nicholas Nethercote Date: Tue, 27 Sep 2005 19:46:46 +0000 (+0000) Subject: Fix scalar and cmdline[12]. X-Git-Tag: svn/VALGRIND_3_1_0~437 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11dfb2e8a0aa91213aed474fca70e3bbc199c8b4;p=thirdparty%2Fvalgrind.git Fix scalar and cmdline[12]. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4790 --- diff --git a/memcheck/tests/x86/scalar.c b/memcheck/tests/x86/scalar.c index 4707378fbe..d915a274d0 100644 --- a/memcheck/tests/x86/scalar.c +++ b/memcheck/tests/x86/scalar.c @@ -316,7 +316,7 @@ int main(void) SY(__NR_setsid); SUCC_OR_FAIL; // __NR_sigaction 67 - GO(__NR_sigaction, "3s 2m"); + GO(__NR_sigaction, "3s 4m"); SY(__NR_sigaction, x0, x0+&px[1], x0+&px[1]); FAIL; // __NR_sgetmask 68 sys_sgetmask() @@ -762,7 +762,7 @@ int main(void) //SY(__NR_rt_sigreturn); // (Not yet handled by Valgrind) FAIL; // __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; // __NR_rt_sigprocmask 175 diff --git a/memcheck/tests/x86/scalar.stderr.exp b/memcheck/tests/x86/scalar.stderr.exp index 4a527e7cd2..c7755713da 100644 --- a/memcheck/tests/x86/scalar.stderr.exp +++ b/memcheck/tests/x86/scalar.stderr.exp @@ -782,7 +782,7 @@ Syscall param dup2(newfd) contains uninitialised byte(s) 66: __NR_setsid 0s 0m ----------------------------------------------------- ----------------------------------------------------- - 67: __NR_sigaction 3s 2m + 67: __NR_sigaction 3s 4m ----------------------------------------------------- Syscall param sigaction(signum) contains uninitialised byte(s) @@ -800,11 +800,7 @@ Syscall param sigaction(oldact) contains uninitialised byte(s) by 0x........: __libc_start_main (in /...libc...) by 0x........: ... -<<<<<<< .working Syscall param sigaction(act->sa_handler) points to unaddressable byte(s) -======= -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 @@ Syscall param rt_sigaction(act->sa_handler) points to unaddressable byte(s) at 0x........: malloc (vg_replace_malloc.c:...) by 0x........: main (scalar.c:24) -<<<<<<< .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 @@ Syscall param sigaction(act->sa_flags) points to unaddressable byte(s) at 0x........: malloc (vg_replace_malloc.c:...) by 0x........: main (scalar.c:24) -======= -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 @@ Syscall param prctl(arg5) contains uninitialised byte(s) 173: __NR_rt_sigreturn n/a ----------------------------------------------------- ----------------------------------------------------- -174: __NR_rt_sigaction 4s 2m +174: __NR_rt_sigaction 4s 4m ----------------------------------------------------- Syscall param rt_sigaction(signum) contains uninitialised byte(s) @@ -2439,7 +2416,6 @@ Syscall param rt_sigaction(sigsetsize) contains uninitialised byte(s) by 0x........: __libc_start_main (in /...libc...) by 0x........: ... -<<<<<<< .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 @@ Syscall param rt_sigaction(act->sa_mask) points to unaddressable byte(s) by 0x........: ... Address 0x........ is not stack'd, malloc'd or (recently) free'd -======= ->>>>>>> .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...) diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp index 80222fd655..fada224542 100644 --- a/none/tests/cmdline1.stdout.exp +++ b/none/tests/cmdline1.stdout.exp @@ -18,7 +18,8 @@ usage: valgrind --tool= [options] prog-and-args uncommon user options for all Valgrind tools: --run-libc-freeres=no|yes free up glibc memory at exit? [yes] - --weird-hacks=hack1,hack2,... recognised hacks: lax-ioctls,ioctl-mmap [none] + --weird-hacks=hack1,hack2,... known hacks: lax-ioctls,ioctl-mmap + enable-outer [none] --pointercheck=no|yes enforce client address space limits [yes] --show-emwarns=no|yes show warnings about emulation limits? [no] --smc-check=none|stack|all checks for self-modifying code: none, diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp index 761ad269d1..ca94f08503 100644 --- a/none/tests/cmdline2.stdout.exp +++ b/none/tests/cmdline2.stdout.exp @@ -18,7 +18,8 @@ usage: valgrind --tool= [options] prog-and-args uncommon user options for all Valgrind tools: --run-libc-freeres=no|yes free up glibc memory at exit? [yes] - --weird-hacks=hack1,hack2,... recognised hacks: lax-ioctls,ioctl-mmap [none] + --weird-hacks=hack1,hack2,... known hacks: lax-ioctls,ioctl-mmap + enable-outer [none] --pointercheck=no|yes enforce client address space limits [yes] --show-emwarns=no|yes show warnings about emulation limits? [no] --smc-check=none|stack|all checks for self-modifying code: none,