Darwin .exp fixes following r10783.

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

diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-darwin b/drd/tests/tc23_bogus_condwait.stderr.exp-darwin
index f2132860e4eea50e8b63f09e22e6b5001ca946e6..7832a6f6d137d77409431995a01e825af94ffa71 100644 (file)
--- a/drd/tests/tc23_bogus_condwait.stderr.exp-darwin
+++ b/drd/tests/tc23_bogus_condwait.stderr.exp-darwin
@@ -48,8 +48,8 @@ cond 0x........ was first observed at:
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc23_bogus_condwait.c:53)
-The impossible happened: mutex 0x........ is locked simultaneously by two threads (recursion count 1, owners 2 and 1) !
 
+The impossible happened: mutex 0x........ is locked simultaneously by two threads (recursion count 1, owners 2 and 1) !
 Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 2, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)

diff --git a/memcheck/tests/darwin/aio.stderr.exp b/memcheck/tests/darwin/aio.stderr.exp
index abcf70069f9ca57627df8da0799f9d65296ac6b0..fd7bbf9f8b91dabc3c57e751d3837509fdf4865b 100644 (file)
--- a/memcheck/tests/darwin/aio.stderr.exp
+++ b/memcheck/tests/darwin/aio.stderr.exp
@@ -11,9 +11,11 @@ Syscall param aio_write(aiocbp->aio_buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
+
 HEAP SUMMARY:
     in use at exit: ... bytes in ... blocks
   total heap usage: ... allocs, ... frees, ... bytes allocated
+
 For a detailed leak analysis, rerun with: --leak-check=full
 
 For counts of detected and suppressed errors, rerun with: -v

diff --git a/memcheck/tests/darwin/scalar.stderr.exp b/memcheck/tests/darwin/scalar.stderr.exp
index 12960a571967719dc482d2b7e7dec1d9f8d92947..348477bb8501e4a8a36a7987342f24ce51af0632 100644 (file)
--- a/memcheck/tests/darwin/scalar.stderr.exp
+++ b/memcheck/tests/darwin/scalar.stderr.exp
@@ -22,10 +22,10 @@ Syscall param read(count) contains uninitialised byte(s)
 Syscall param read(buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000004(4):          __NR_write 3s 1m
 -----------------------------------------------------
-
 Syscall param write(fd) contains uninitialised byte(s)
    ...
 
@@ -38,10 +38,10 @@ Syscall param write(count) contains uninitialised byte(s)
 Syscall param write(buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000005(5):           __NR_open (2-args) 2s 1m
 -----------------------------------------------------
-
 Syscall param open(filename) contains uninitialised byte(s)
    ...
 
@@ -51,22 +51,22 @@ Syscall param open(flags) contains uninitialised byte(s)
 Syscall param open(filename) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000005(5):           __NR_open (3-args) 1s 0m
 -----------------------------------------------------
-
 Syscall param open(mode) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x2000006(6):          __NR_close 1s 0m
 -----------------------------------------------------
-
 Syscall param close(fd) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x2000007(7):          __NR_wait4 4s 2m
 -----------------------------------------------------
-
 Syscall param wait4(pid) contains uninitialised byte(s)
    ...
 
@@ -86,13 +86,13 @@ Syscall param wait4(status) points to unaddressable byte(s)
 Syscall param wait4(rusage) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (8):             old creat
 -----------------------------------------------------
 -----------------------------------------------------
 x2000009(9):           __NR_link 2s 2m
 -----------------------------------------------------
-
 Syscall param link(oldpath) contains uninitialised byte(s)
    ...
 
@@ -106,39 +106,39 @@ Syscall param link(oldpath) points to unaddressable byte(s)
 Syscall param link(newpath) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x200000a(10):         __NR_unlink 1s 1m
 -----------------------------------------------------
-
 Syscall param unlink(pathname) contains uninitialised byte(s)
    ...
 
 Syscall param unlink(pathname) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (11):            old execv
 -----------------------------------------------------
 -----------------------------------------------------
 x200000c(12):          __NR_chdir 1s 1m
 -----------------------------------------------------
-
 Syscall param chdir(path) contains uninitialised byte(s)
    ...
 
 Syscall param chdir(path) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x200000d(13):         __NR_fchdir 1s 0m
 -----------------------------------------------------
-
 Syscall param fchdir(fd) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x200000e(14):          __NR_mknod 3s 1m
 -----------------------------------------------------
-
 Syscall param mknod(pathname) contains uninitialised byte(s)
    ...
 
@@ -151,10 +151,10 @@ Syscall param mknod(dev) contains uninitialised byte(s)
 Syscall param mknod(pathname) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x200000f(15):          __NR_chmod 2s 1m
 -----------------------------------------------------
-
 Syscall param chmod(path) contains uninitialised byte(s)
    ...
 
@@ -164,10 +164,10 @@ Syscall param chmod(mode) contains uninitialised byte(s)
 Syscall param chmod(path) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000010(16):          __NR_chown 3s 1m
 -----------------------------------------------------
-
 Syscall param chown(path) contains uninitialised byte(s)
    ...
 
@@ -180,13 +180,13 @@ Syscall param chown(group) contains uninitialised byte(s)
 Syscall param chown(path) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (17):            old break
 -----------------------------------------------------
 -----------------------------------------------------
 x2000012(18):      __NR_getfsstat 3s 1m
 -----------------------------------------------------
-
 Syscall param getfsstat(buf) contains uninitialised byte(s)
    ...
 
@@ -199,6 +199,7 @@ Syscall param getfsstat(flags) contains uninitialised byte(s)
 Syscall param getfsstat(buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (19):            old lseek
 -----------------------------------------------------
@@ -253,7 +254,6 @@ Syscall param getfsstat(buf) points to unaddressable byte(s)
 -----------------------------------------------------
 x200004e(78):        __NR_mincore 3s 1m
 -----------------------------------------------------
-
 Syscall param mincore(start) contains uninitialised byte(s)
    ...
 
@@ -266,15 +266,16 @@ Syscall param mincore(vec) contains uninitialised byte(s)
 Syscall param mincore(vec) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000052(82):        __NR_setpgid 2s 0m
 -----------------------------------------------------
-
 Syscall param setpgid(pid) contains uninitialised byte(s)
    ...
 
 Syscall param setpgid(pgid) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 (78):            old wait
 -----------------------------------------------------
@@ -305,7 +306,6 @@ Syscall param setpgid(pgid) contains uninitialised byte(s)
 -----------------------------------------------------
 x2000069(105):     __NR_setsockopt 5s 1m
 -----------------------------------------------------
-
 Syscall param setsockopt(s) contains uninitialised byte(s)
    ...
 
@@ -324,6 +324,7 @@ Syscall param setsockopt(optlen) contains uninitialised byte(s)
 Syscall param socketcall.setsockopt(optval) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (107):           old vtimes
 -----------------------------------------------------
@@ -351,7 +352,6 @@ Syscall param socketcall.setsockopt(optval) points to unaddressable byte(s)
 -----------------------------------------------------
 x2000076(118):     __NR_getsockopt 5s 1m
 -----------------------------------------------------
-
 Syscall param getsockopt(s) contains uninitialised byte(s)
    ...
 
@@ -372,6 +372,7 @@ Syscall param socketcall.getsockopt(optlen) points to unaddressable byte(s)
  Address 0x........ is 0 bytes after a block of size 4 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (scalar.c:14)
+
 -----------------------------------------------------
 (119):           old resuba
 -----------------------------------------------------
@@ -426,7 +427,6 @@ Syscall param socketcall.getsockopt(optlen) points to unaddressable byte(s)
 -----------------------------------------------------
 x20000a7(167):          __NR_mount 4s 2m
 -----------------------------------------------------
-
 Syscall param mount(type) contains uninitialised byte(s)
    ...
 
@@ -446,13 +446,13 @@ Syscall param mount(type) points to unaddressable byte(s)
 Syscall param mount(dir) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (168):           old ustat
 -----------------------------------------------------
 -----------------------------------------------------
 x20000a9(169):          __NR_csops 4s 1m
 -----------------------------------------------------
-
 Syscall param csops(pid) contains uninitialised byte(s)
    ...
 
@@ -468,6 +468,7 @@ Syscall param csops(usersize) contains uninitialised byte(s)
 Syscall param csops(useraddr) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (170):           old table
 -----------------------------------------------------
@@ -498,7 +499,6 @@ Syscall param csops(useraddr) points to unaddressable byte(s)
 -----------------------------------------------------
 x20000df(223):   __NR_exchangedata 3s 2m
 -----------------------------------------------------
-
 Syscall param exchangedata(path1) contains uninitialised byte(s)
    ...
 
@@ -515,6 +515,7 @@ Syscall param exchangedata(path1) points to unaddressable byte(s)
 Syscall param exchangedata(path2) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (228-229):       unused
 -----------------------------------------------------
@@ -530,7 +531,6 @@ Syscall param exchangedata(path2) points to unaddressable byte(s)
 -----------------------------------------------------
 x2000106(262):          __NR_shmat 3s 0m
 -----------------------------------------------------
-
 Syscall param shmat(shmid) contains uninitialised byte(s)
    ...
 
@@ -539,10 +539,10 @@ Syscall param shmat(shmaddr) contains uninitialised byte(s)
 
 Syscall param shmat(shmflg) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x2000107(263):         __NR_shmctl 3s 1m
 -----------------------------------------------------
-
 Syscall param shmctl(shmid) contains uninitialised byte(s)
    ...
 
@@ -555,16 +555,16 @@ Syscall param shmctl(buf) contains uninitialised byte(s)
 Syscall param shmctl(IPC_STAT, buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000108(264):          __NR_shmdt 1s 0m
 -----------------------------------------------------
-
 Syscall param shmdt(shmaddr) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x2000109(265):         __NR_shmget 3s 0m
 -----------------------------------------------------
-
 Syscall param shmget(key) contains uninitialised byte(s)
    ...
 
@@ -573,10 +573,10 @@ Syscall param shmget(size) contains uninitialised byte(s)
 
 Syscall param shmget(shmflg) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x200010c(268):       __NR_sem_open 2s 1m
 -----------------------------------------------------
-
 Syscall param sem_open(name) contains uninitialised byte(s)
    ...
 
@@ -586,56 +586,56 @@ Syscall param sem_open(oflag) contains uninitialised byte(s)
 Syscall param sem_open(name) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x200010c(268):       __NR_sem_open (4-args) 2s 0m
 -----------------------------------------------------
-
 Syscall param sem_open(mode) contains uninitialised byte(s)
    ...
 
 Syscall param sem_open(value) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x200010d(269):      __NR_sem_close 1s 0m
 -----------------------------------------------------
-
 Syscall param sem_close(sem) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x200010e(270):     __NR_sem_unlink 1s 1m
 -----------------------------------------------------
-
 Syscall param sem_unlink(name) contains uninitialised byte(s)
    ...
 
 Syscall param sem_unlink(name) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x200010f(271):       __NR_sem_wait 1s 0m
 -----------------------------------------------------
-
 Syscall param sem_wait(sem) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x2000110(272):    __NR_sem_trywait 1s 0m
 -----------------------------------------------------
-
 Syscall param sem_trywait(sem) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x2000111(273):       __NR_sem_post 1s 0m
 -----------------------------------------------------
-
 Syscall param sem_post(sem) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x2000113(275):       __NR_sem_init 3s 1m
 -----------------------------------------------------
 
 More than 100 errors detected.  Subsequent errors
 will still be recorded, but in less detail than before.
-
 Syscall param sem_init(sem) contains uninitialised byte(s)
    ...
 
@@ -648,20 +648,20 @@ Syscall param sem_init(value) contains uninitialised byte(s)
 Syscall param sem_init(sem) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000114(276):    __NR_sem_destroy 1s 1m
 -----------------------------------------------------
-
 Syscall param sem_destroy(sem) contains uninitialised byte(s)
    ...
 
 Syscall param sem_destroy(sem) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000117(279):  __NR_stat_extended 4s 4m
 -----------------------------------------------------
-
 Syscall param stat_extended(file_name) contains uninitialised byte(s)
    ...
 
@@ -689,10 +689,10 @@ Syscall param stat_extended(fsacl_size) points to unaddressable byte(s)
 Syscall param stat_extended(fsacl) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000118(280): __NR_lstat_extended 4s 4m
 -----------------------------------------------------
-
 Syscall param lstat_extended(file_name) contains uninitialised byte(s)
    ...
 
@@ -720,10 +720,10 @@ Syscall param lstat_extended(fsacl_size) points to unaddressable byte(s)
 Syscall param lstat_extended(fsacl) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000119(280): __NR_fstat_extended 4s 3m
 -----------------------------------------------------
-
 Syscall param fstat_extended(fd) contains uninitialised byte(s)
    ...
 
@@ -747,6 +747,7 @@ Syscall param fstat_extended(fsacl_size) points to unaddressable byte(s)
 Syscall param fstat_extended(fsacl) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (296):           old load_shared_file
 -----------------------------------------------------
@@ -765,13 +766,12 @@ Syscall param fstat_extended(fsacl) points to unaddressable byte(s)
 -----------------------------------------------------
 x200013a(314):     __NR_aio_return 1s 0m
 -----------------------------------------------------
-
 Syscall param aio_return(aiocbp) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x200013b(315):    __NR_aio_suspend 1s 0m
 -----------------------------------------------------
-
 Syscall param aio_suspend(aiocbp) contains uninitialised byte(s)
    ...
 
@@ -784,32 +784,33 @@ Syscall param aio_suspend(timeout) contains uninitialised byte(s)
 Syscall param aio_suspend(list) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x200013d(317):      __NR_aio_error 1s 0m
 -----------------------------------------------------
-
 Syscall param aio_error(aiocbp) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 x200013e(318):       __NR_aio_read 1s 1m
 -----------------------------------------------------
-
 Syscall param aio_read(aiocbp) contains uninitialised byte(s)
    ...
 
 Syscall param aio_read(aiocbp) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x200013f(319):      __NR_aio_write 1s 1m
 -----------------------------------------------------
-
 Syscall param aio_write(aiocbp) contains uninitialised byte(s)
    ...
 
 Syscall param aio_write(aiocbp) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (323):           unused
 -----------------------------------------------------
@@ -819,19 +820,18 @@ Syscall param aio_write(aiocbp) points to unaddressable byte(s)
 -----------------------------------------------------
 x2000148(328): __NR___pthread_kill 2s 0m
 -----------------------------------------------------
-
 Syscall param __pthread_kill(thread) contains uninitialised byte(s)
    ...
 
 Syscall param __pthread_kill(sig) contains uninitialised byte(s)
    ...
+
 -----------------------------------------------------
 (335):           old utrace
 -----------------------------------------------------
 -----------------------------------------------------
 x2000155(341):__NR_stat64_extended 4s 4m
 -----------------------------------------------------
-
 Syscall param stat64_extended(file_name) contains uninitialised byte(s)
    ...
 
@@ -859,10 +859,10 @@ Syscall param stat64_extended(fsacl_size) points to unaddressable byte(s)
 Syscall param stat64_extended(fsacl) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000156(342):__NR_lstat64_extended 4s 4m
 -----------------------------------------------------
-
 Syscall param lstat64_extended(file_name) contains uninitialised byte(s)
    ...
 
@@ -890,10 +890,10 @@ Syscall param lstat64_extended(fsacl_size) points to unaddressable byte(s)
 Syscall param lstat64_extended(fsacl) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x2000157(342):__NR_fstat64_extended 4s 3m
 -----------------------------------------------------
-
 Syscall param fstat64_extended(fd) contains uninitialised byte(s)
    ...
 
@@ -917,10 +917,10 @@ Syscall param fstat64_extended(fsacl_size) points to unaddressable byte(s)
 Syscall param fstat64_extended(fsacl) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 x200015b(347):    __NR_getfsstat64 3s 1m
 -----------------------------------------------------
-
 Syscall param getfsstat64(buf) contains uninitialised byte(s)
    ...
 
@@ -933,6 +933,7 @@ Syscall param getfsstat64(flags) contains uninitialised byte(s)
 Syscall param getfsstat64(buf) points to unaddressable byte(s)
    ...
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 -----------------------------------------------------
 (369-379):       unused
 -----------------------------------------------------
@@ -947,6 +948,6 @@ it at http://valgrind.org/support/bug_reports.html.
 -----------------------------------------------------
 x2000001(1):           __NR_exit 1s 0m
 -----------------------------------------------------
-
 Syscall param exit(status) contains uninitialised byte(s)
    ...
+

diff --git a/memcheck/tests/darwin/scalar_nocancel.stderr.exp b/memcheck/tests/darwin/scalar_nocancel.stderr.exp
index 63c7325175af9669b002f55e485e1cad683affab..aa10ce413cf1a4589a4b0b9956564ac068170d4f 100644 (file)
--- a/memcheck/tests/darwin/scalar_nocancel.stderr.exp
+++ b/memcheck/tests/darwin/scalar_nocancel.stderr.exp
@@ -3,3 +3,4 @@ x20001a4(420):__NR_sem_wait_nocancel 1s 0m
 -----------------------------------------------------
 Syscall param sem_wait(sem) contains uninitialised byte(s)
    ...
+