From ed93dc1aea0404e262239090638d59d892083ff0 Mon Sep 17 00:00:00 2001 From: Ivo Raisr Date: Sun, 29 May 2016 17:28:00 +0000 Subject: [PATCH] Unify expected output of memcheck/tests/solaris/scalar test case on amd64 and x86 architectures. n-i-bz git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15886 --- memcheck/tests/solaris/scalar.c | 4 ++-- memcheck/tests/solaris/scalar.stderr.exp | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/memcheck/tests/solaris/scalar.c b/memcheck/tests/solaris/scalar.c index 30eed7be75..d660ca2673 100644 --- a/memcheck/tests/solaris/scalar.c +++ b/memcheck/tests/solaris/scalar.c @@ -676,8 +676,8 @@ static int sys_uname2(void) __attribute__((noinline)) static void sys_modctl(void) { - GO(SYS_modctl, "(MODLOAD) 3s 1m"); - SY(SYS_modctl, x0 + MODLOAD, x0 - 1, x0 + 1); FAIL; + GO(SYS_modctl, "(MODLOAD) 4s 1m"); + SY(SYS_modctl, x0 + MODLOAD, x0 + 1, x0 - 1, x0 - 1); FAIL; } __attribute__((noinline)) diff --git a/memcheck/tests/solaris/scalar.stderr.exp b/memcheck/tests/solaris/scalar.stderr.exp index 6d084b2b6a..83bfdd7b9a 100644 --- a/memcheck/tests/solaris/scalar.stderr.exp +++ b/memcheck/tests/solaris/scalar.stderr.exp @@ -2466,7 +2466,7 @@ Syscall param lwp_detach(lwpid) contains uninitialised byte(s) ... --------------------------------------------------------- -152: SYS_modctl (MODLOAD) 3s 1m +152: SYS_modctl (MODLOAD) 4s 1m --------------------------------------------------------- Syscall param modctl_modload(cmd) contains uninitialised byte(s) ... @@ -2477,10 +2477,17 @@ Syscall param modctl_modload(use_path) contains uninitialised byte(s) Syscall param modctl_modload(filename) contains uninitialised byte(s) ... +Syscall param modctl_modload(rvp) contains uninitialised byte(s) + ... + Syscall param modctl(filaneme) points to unaddressable byte(s) ... Address 0x........ is not stack'd, malloc'd or (recently) free'd +Syscall param modctl(rvp) points to unaddressable byte(s) + ... + Address 0x........ is not stack'd, malloc'd or (recently) free'd + --------------------------------------------------------- 152: SYS_modctl (MODUNLOAD) 2s 0m --------------------------------------------------------- -- 2.47.2