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

diff --git a/memcheck/tests/solaris/scalar.c b/memcheck/tests/solaris/scalar.c
index 30eed7be75c59916add9051b3b2766dad9d59ae8..d660ca2673043197a3673e62777888647626fca8 100644 (file)
--- 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 6d084b2b6a1d2405ef46071f4aedb49d91cddf68..83bfdd7b9af256efad5fe4883d0b1431a6798e22 100644 (file)
--- 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
 ---------------------------------------------------------