fix incorrect counts

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3027

diff --git a/memcheck/tests/scalar.c b/memcheck/tests/scalar.c
index 664e82d538fa3d38500571a55f7c157172fb72d4..0b0796526718333400fb20d6c4f53c1897b8f5ff 100644 (file)
--- a/memcheck/tests/scalar.c
+++ b/memcheck/tests/scalar.c
@@ -135,8 +135,8 @@ int main(void)
  //SY(__NR_stime); // (Not yet handled by Valgrind) FAIL;
 
    // __NR_ptrace 26
-   // XXX: memory pointed to be arg3 is never checked...
-   GO(__NR_ptrace, "4s 2m");
+   // XXX: memory pointed to be arg3 goes unchecked... otherwise would be 2m
+   GO(__NR_ptrace, "4s 1m");
    SY(__NR_ptrace, x0+PTRACE_GETREGS, x0, x0, x0); FAIL;
 
    // __NR_alarm 27
@@ -1191,7 +1191,7 @@ int main(void)
  //SY(__NR_set_mempolicy); // (Not yet handled by Valgrind) FAIL;
 
    // __NR_mq_open 277
-   GO(__NR_mq_open, "4s 2m");
+   GO(__NR_mq_open, "4s 3m");
    SY(__NR_mq_open, x0, x0+O_CREAT, x0, x0+1); FAIL;
 
    // __NR_mq_unlink (__NR_mq_open+1)

diff --git a/memcheck/tests/scalar.stderr.exp b/memcheck/tests/scalar.stderr.exp
index 0797a4127e3e9b1773b9af534088c8f18d68615f..9f69e2e578a27dbb87d711488ab4717dd3522335 100644 (file)
--- a/memcheck/tests/scalar.stderr.exp
+++ b/memcheck/tests/scalar.stderr.exp
@@ -377,7 +377,7 @@ Syscall param setuid16(uid) contains uninitialised byte(s)
  25:          __NR_stime n/a
 -----------------------------------------------------
 -----------------------------------------------------
- 26:         __NR_ptrace 4s 2m
+ 26:         __NR_ptrace 4s 1m
 -----------------------------------------------------
 
 Syscall param ptrace(request) contains uninitialised byte(s)
@@ -4364,7 +4364,7 @@ Syscall param utimes(tvp) points to unaddressable byte(s)
 276:  __NR_set_mempolicy n/a
 -----------------------------------------------------
 -----------------------------------------------------
-277:        __NR_mq_open 4s 2m
+277:        __NR_mq_open 4s 3m
 -----------------------------------------------------
 
 Syscall param mq_open(name) contains uninitialised byte(s)