|
From: <sv...@va...> - 2016-05-29 17:28:07
|
Author: iraisr
Date: Sun May 29 18:28:00 2016
New Revision: 15886
Log:
Unify expected output of memcheck/tests/solaris/scalar test case
on amd64 and x86 architectures.
n-i-bz
Modified:
trunk/memcheck/tests/solaris/scalar.c
trunk/memcheck/tests/solaris/scalar.stderr.exp
Modified: trunk/memcheck/tests/solaris/scalar.c
==============================================================================
--- trunk/memcheck/tests/solaris/scalar.c (original)
+++ trunk/memcheck/tests/solaris/scalar.c Sun May 29 18:28:00 2016
@@ -676,8 +676,8 @@
__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))
Modified: trunk/memcheck/tests/solaris/scalar.stderr.exp
==============================================================================
--- trunk/memcheck/tests/solaris/scalar.stderr.exp (original)
+++ trunk/memcheck/tests/solaris/scalar.stderr.exp Sun May 29 18:28:00 2016
@@ -2466,7 +2466,7 @@
...
---------------------------------------------------------
-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(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
---------------------------------------------------------
|