From: Julian Seward Date: Mon, 11 Dec 2006 03:23:41 +0000 (+0000) Subject: Fix various regtests, mostly by adding 64-bit outputs. X-Git-Tag: svn/VALGRIND_3_3_0~492 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b650be145e5e92cf1d472a5a23a69ea5ba1ac6df;p=thirdparty%2Fvalgrind.git Fix various regtests, mostly by adding 64-bit outputs. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6394 --- diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 5591905d4c..c15c1ef3aa 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -54,12 +54,12 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ inline.stderr.exp inline.stdout.exp inline.vgtest \ leak-0.vgtest leak-0.stderr.exp \ leak-cycle.vgtest leak-cycle.stderr.exp leak-cycle.stderr.exp64 \ - leak-pool-0.vgtest leak-pool-0.stderr.exp \ - leak-pool-1.vgtest leak-pool-1.stderr.exp \ - leak-pool-2.vgtest leak-pool-2.stderr.exp \ - leak-pool-3.vgtest leak-pool-3.stderr.exp \ - leak-pool-4.vgtest leak-pool-4.stderr.exp \ - leak-pool-5.vgtest leak-pool-5.stderr.exp \ + leak-pool-0.vgtest leak-pool-0.stderr.exp leak-pool-0.stderr.exp64 \ + leak-pool-1.vgtest leak-pool-1.stderr.exp leak-pool-1.stderr.exp64 \ + leak-pool-2.vgtest leak-pool-2.stderr.exp leak-pool-2.stderr.exp64 \ + leak-pool-3.vgtest leak-pool-3.stderr.exp leak-pool-3.stderr.exp64 \ + leak-pool-4.vgtest leak-pool-4.stderr.exp leak-pool-4.stderr.exp64 \ + leak-pool-5.vgtest leak-pool-5.stderr.exp leak-pool-5.stderr.exp64 \ leak-tree.vgtest leak-tree.stderr.exp \ leak-tree.stderr.exp2 leak-tree.stderr.exp64 \ leak-regroot.vgtest leak-regroot.stderr.exp \ diff --git a/memcheck/tests/leak-pool-0.stderr.exp64 b/memcheck/tests/leak-pool-0.stderr.exp64 new file mode 100644 index 0000000000..3015aa8346 --- /dev/null +++ b/memcheck/tests/leak-pool-0.stderr.exp64 @@ -0,0 +1,7 @@ + + +ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) +malloc/free: in use at exit: 4,120 bytes in 2 blocks. +malloc/free: 102 allocs, 0 frees, 5,720 bytes allocated. +For a detailed leak analysis, rerun with: --leak-check=yes +For counts of detected errors, rerun with: -v diff --git a/memcheck/tests/leak-pool-1.stderr.exp64 b/memcheck/tests/leak-pool-1.stderr.exp64 new file mode 100644 index 0000000000..3015aa8346 --- /dev/null +++ b/memcheck/tests/leak-pool-1.stderr.exp64 @@ -0,0 +1,7 @@ + + +ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) +malloc/free: in use at exit: 4,120 bytes in 2 blocks. +malloc/free: 102 allocs, 0 frees, 5,720 bytes allocated. +For a detailed leak analysis, rerun with: --leak-check=yes +For counts of detected errors, rerun with: -v diff --git a/memcheck/tests/leak-pool-2.stderr.exp64 b/memcheck/tests/leak-pool-2.stderr.exp64 new file mode 100644 index 0000000000..3015aa8346 --- /dev/null +++ b/memcheck/tests/leak-pool-2.stderr.exp64 @@ -0,0 +1,7 @@ + + +ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) +malloc/free: in use at exit: 4,120 bytes in 2 blocks. +malloc/free: 102 allocs, 0 frees, 5,720 bytes allocated. +For a detailed leak analysis, rerun with: --leak-check=yes +For counts of detected errors, rerun with: -v diff --git a/memcheck/tests/leak-pool-3.stderr.exp64 b/memcheck/tests/leak-pool-3.stderr.exp64 new file mode 100644 index 0000000000..3015aa8346 --- /dev/null +++ b/memcheck/tests/leak-pool-3.stderr.exp64 @@ -0,0 +1,7 @@ + + +ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) +malloc/free: in use at exit: 4,120 bytes in 2 blocks. +malloc/free: 102 allocs, 0 frees, 5,720 bytes allocated. +For a detailed leak analysis, rerun with: --leak-check=yes +For counts of detected errors, rerun with: -v diff --git a/memcheck/tests/leak-pool-4.stderr.exp64 b/memcheck/tests/leak-pool-4.stderr.exp64 new file mode 100644 index 0000000000..3015aa8346 --- /dev/null +++ b/memcheck/tests/leak-pool-4.stderr.exp64 @@ -0,0 +1,7 @@ + + +ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) +malloc/free: in use at exit: 4,120 bytes in 2 blocks. +malloc/free: 102 allocs, 0 frees, 5,720 bytes allocated. +For a detailed leak analysis, rerun with: --leak-check=yes +For counts of detected errors, rerun with: -v diff --git a/memcheck/tests/leak-pool-5.stderr.exp64 b/memcheck/tests/leak-pool-5.stderr.exp64 new file mode 100644 index 0000000000..3015aa8346 --- /dev/null +++ b/memcheck/tests/leak-pool-5.stderr.exp64 @@ -0,0 +1,7 @@ + + +ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) +malloc/free: in use at exit: 4,120 bytes in 2 blocks. +malloc/free: 102 allocs, 0 frees, 5,720 bytes allocated. +For a detailed leak analysis, rerun with: --leak-check=yes +For counts of detected errors, rerun with: -v diff --git a/memcheck/tests/mempool.stderr.exp64 b/memcheck/tests/mempool.stderr.exp64 index 849735484f..ad50a26634 100644 --- a/memcheck/tests/mempool.stderr.exp64 +++ b/memcheck/tests/mempool.stderr.exp64 @@ -35,7 +35,25 @@ Invalid write of size 1 by 0x........: main (mempool.c:148) -100,048 (32 direct, 100,016 indirect) bytes in 1 blocks are definitely lost in loss record 2 of 3 +10 bytes in 1 blocks are definitely lost in loss record 1 of 5 + at 0x........: allocate (mempool.c:99) + by 0x........: test (mempool.c:135) + by 0x........: main (mempool.c:148) + + +10 bytes in 1 blocks are definitely lost in loss record 2 of 5 + at 0x........: allocate (mempool.c:99) + by 0x........: test (mempool.c:115) + by 0x........: main (mempool.c:148) + + +20 bytes in 1 blocks are definitely lost in loss record 4 of 5 + at 0x........: allocate (mempool.c:99) + by 0x........: test (mempool.c:116) + by 0x........: main (mempool.c:148) + + +48 (32 direct, 16 indirect) bytes in 1 blocks are definitely lost in loss record 5 of 5 at 0x........: malloc (vg_replace_malloc.c:...) by 0x........: make_pool (mempool.c:37) by 0x........: test (mempool.c:111) diff --git a/none/tests/fdleak_cmsg.stderr.exp4 b/none/tests/fdleak_cmsg.stderr.exp4 index 4b631b902a..176a555ccd 100644 --- a/none/tests/fdleak_cmsg.stderr.exp4 +++ b/none/tests/fdleak_cmsg.stderr.exp4 @@ -3,23 +3,23 @@ FILE DESCRIPTORS: 7 open at exit. Open AF_UNIX socket .: /tmp/sock at 0x........: accept (in /...libc...) - by 0x........: server (fdleak_cmsg.c:64) - by 0x........: main (fdleak_cmsg.c:174) + by 0x........: server (fdleak_cmsg.c:85) + by 0x........: main (fdleak_cmsg.c:195) Open AF_UNIX socket .: /tmp/sock at 0x........: socket (in /...libc...) - by 0x........: server (fdleak_cmsg.c:33) - by 0x........: main (fdleak_cmsg.c:174) + by 0x........: server (fdleak_cmsg.c:54) + by 0x........: main (fdleak_cmsg.c:195) Open file descriptor .: /tmp/data2 at 0x........: open (in /...libc...) - by 0x........: server (fdleak_cmsg.c:27) - by 0x........: (below main) (in /...libc...) + by 0x........: server (fdleak_cmsg.c:48) + by 0x........: main (fdleak_cmsg.c:195) Open file descriptor .: /tmp/data1 at 0x........: open (in /...libc...) - by 0x........: server (fdleak_cmsg.c:21) - by 0x........: (below main) (in /...libc...) + by 0x........: server (fdleak_cmsg.c:42) + by 0x........: main (fdleak_cmsg.c:195) Open file descriptor .: . @@ -35,18 +35,18 @@ Open file descriptor .: /dev/null FILE DESCRIPTORS: 6 open at exit. Open file descriptor .: /tmp/data2 at 0x........: recvmsg (in /...libc...) - by 0x........: client (fdleak_cmsg.c:131) - by 0x........: main (fdleak_cmsg.c:178) + by 0x........: client (fdleak_cmsg.c:152) + by 0x........: main (fdleak_cmsg.c:199) Open file descriptor .: /tmp/data1 at 0x........: recvmsg (in /...libc...) - by 0x........: client (fdleak_cmsg.c:131) - by 0x........: main (fdleak_cmsg.c:178) + by 0x........: client (fdleak_cmsg.c:152) + by 0x........: main (fdleak_cmsg.c:199) Open AF_UNIX socket .: at 0x........: socket (in /...libc...) - by 0x........: client (fdleak_cmsg.c:110) - by 0x........: main (fdleak_cmsg.c:178) + by 0x........: client (fdleak_cmsg.c:131) + by 0x........: main (fdleak_cmsg.c:199) Open file descriptor .: . diff --git a/none/tests/rlimit_nofile.c b/none/tests/rlimit_nofile.c index f581dc0922..ed12af38ee 100644 --- a/none/tests/rlimit_nofile.c +++ b/none/tests/rlimit_nofile.c @@ -10,7 +10,7 @@ int main(int argc, char **argv) struct rlimit oldrlim; struct rlimit newrlim; int fd; - + close(4); /* seems to be inherited from parent on SuSE 10.1 amd64 */ if (getrlimit(RLIMIT_NOFILE, &oldrlim) < 0) { perror("getrlimit");