|
From: <sv...@va...> - 2009-04-29 23:34:13
|
Author: njn
Date: 2009-04-30 00:34:10 +0100 (Thu, 30 Apr 2009)
New Revision: 9682
Log:
Merged r9681 (use -q for varinfo tests) from the trunk. Fixes varinfo[246].
Removed:
branches/DARWIN/memcheck/tests/varinfo6.stderr.exp-glibc25-amd64
branches/DARWIN/memcheck/tests/varinfo6.stderr.exp-glibc25-x86
Modified:
branches/DARWIN/memcheck/tests/Makefile.am
branches/DARWIN/memcheck/tests/varinfo1.stderr.exp
branches/DARWIN/memcheck/tests/varinfo1.vgtest
branches/DARWIN/memcheck/tests/varinfo2.stderr.exp
branches/DARWIN/memcheck/tests/varinfo2.vgtest
branches/DARWIN/memcheck/tests/varinfo3.stderr.exp
branches/DARWIN/memcheck/tests/varinfo3.vgtest
branches/DARWIN/memcheck/tests/varinfo4.stderr.exp
branches/DARWIN/memcheck/tests/varinfo4.vgtest
branches/DARWIN/memcheck/tests/varinfo5.stderr.exp
branches/DARWIN/memcheck/tests/varinfo5.vgtest
branches/DARWIN/memcheck/tests/varinfo6.vgtest
Modified: branches/DARWIN/memcheck/tests/Makefile.am
===================================================================
--- branches/DARWIN/memcheck/tests/Makefile.am 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/Makefile.am 2009-04-29 23:34:10 UTC (rev 9682)
@@ -159,8 +159,7 @@
varinfo3.vgtest varinfo3.stdout.exp varinfo3.stderr.exp \
varinfo4.vgtest varinfo4.stdout.exp varinfo4.stderr.exp \
varinfo5.vgtest varinfo5.stdout.exp varinfo5.stderr.exp \
- varinfo6.vgtest varinfo6.stdout.exp \
- varinfo6.stderr.exp-glibc25-amd64 varinfo6.stderr.exp-glibc25-x86 \
+ varinfo6.vgtest varinfo6.stdout.exp varinfo6.stderr.exp \
vcpu_bz2.stdout.exp vcpu_bz2.stderr.exp vcpu_bz2.vgtest \
vcpu_fbench.stdout.exp vcpu_fbench.stderr.exp vcpu_fbench.vgtest \
vcpu_fnfns.stdout.exp vcpu_fnfns.stdout.exp-glibc28-amd64 \
Modified: branches/DARWIN/memcheck/tests/varinfo1.stderr.exp
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo1.stderr.exp 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo1.stderr.exp 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,4 +1,3 @@
-
Uninitialised byte(s) found during client check request
at 0x........: croak (varinfo1.c:28)
by 0x........: main (varinfo1.c:49)
@@ -35,10 +34,3 @@
by 0x........: main (varinfo1.c:56)
Location 0x........ is 0 bytes inside local var "local"
declared at varinfo1.c:46, in frame #1 of thread 1
-
-ERROR SUMMARY: 6 errors from 6 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 7 allocs, 7 frees, 9 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
-Use --track-origins=yes to see where uninitialised values come from
Modified: branches/DARWIN/memcheck/tests/varinfo1.vgtest
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo1.vgtest 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo1.vgtest 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,2 +1,2 @@
prog: varinfo1
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q
Modified: branches/DARWIN/memcheck/tests/varinfo2.stderr.exp
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo2.stderr.exp 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo2.stderr.exp 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,4 +1,3 @@
-
Uninitialised byte(s) found during client check request
at 0x........: croak (varinfo2.c:28)
by 0x........: foo (varinfo2.c:41)
@@ -19,10 +18,3 @@
by 0x........: main (varinfo2.c:51)
Location 0x........ is 1 byte inside local var "var"
declared at varinfo2.c:37, in frame #1 of thread 1
-
-ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 3 allocs, 3 frees, 3 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
-Use --track-origins=yes to see where uninitialised values come from
Modified: branches/DARWIN/memcheck/tests/varinfo2.vgtest
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo2.vgtest 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo2.vgtest 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,2 +1,2 @@
prog: varinfo2
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q
Modified: branches/DARWIN/memcheck/tests/varinfo3.stderr.exp
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo3.stderr.exp 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo3.stderr.exp 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,4 +1,3 @@
-
Uninitialised byte(s) found during client check request
at 0x........: croak (varinfo3.c:28)
by 0x........: foo (varinfo3.c:54)
@@ -56,10 +55,3 @@
by 0x........: main (varinfo3.c:66)
Location 0x........ is 0 bytes inside nonstatic_local_undef[8],
declared at varinfo3.c:53, in frame #2 of thread 1
-
-ERROR SUMMARY: 8 errors from 8 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 8 allocs, 8 frees, 8 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
-Use --track-origins=yes to see where uninitialised values come from
Modified: branches/DARWIN/memcheck/tests/varinfo3.vgtest
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo3.vgtest 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo3.vgtest 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,3 +1,3 @@
prog: varinfo3
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q
stderr_filter: filter_varinfo3
Modified: branches/DARWIN/memcheck/tests/varinfo4.stderr.exp
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo4.stderr.exp 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo4.stderr.exp 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,4 +1,3 @@
-
Uninitialised byte(s) found during client check request
at 0x........: croak (varinfo4.c:28)
by 0x........: blah (varinfo4.c:47)
@@ -19,10 +18,3 @@
by 0x........: main (varinfo4.c:56)
Location 0x........ is 1 byte inside a[3].xyzzy[21].c2[2],
declared at varinfo4.c:45, in frame #1 of thread 1
-
-ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 3 allocs, 3 frees, 3 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
-Use --track-origins=yes to see where uninitialised values come from
Modified: branches/DARWIN/memcheck/tests/varinfo4.vgtest
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo4.vgtest 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo4.vgtest 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,2 +1,2 @@
prog: varinfo4
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q
Modified: branches/DARWIN/memcheck/tests/varinfo5.stderr.exp
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo5.stderr.exp 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo5.stderr.exp 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,4 +1,3 @@
-
Uninitialised byte(s) found during client check request
at 0x........: croak (varinfo5so.c:29)
by 0x........: varinfo1_main (varinfo5so.c:52)
@@ -178,10 +177,3 @@
Location 0x........ is 1 byte inside a[3].xyzzy[21].c2[2],
declared at varinfo5so.c:135, in frame #1 of thread 1
answer is 0
-
-ERROR SUMMARY: 20 errors from 20 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 21 allocs, 21 frees, 23 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
-Use --track-origins=yes to see where uninitialised values come from
Modified: branches/DARWIN/memcheck/tests/varinfo5.vgtest
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo5.vgtest 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo5.vgtest 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,3 +1,3 @@
prog: varinfo5
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q
stderr_filter: filter_varinfo3
Deleted: branches/DARWIN/memcheck/tests/varinfo6.stderr.exp-glibc25-amd64
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo6.stderr.exp-glibc25-amd64 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo6.stderr.exp-glibc25-amd64 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,28 +0,0 @@
-
-Uninitialised byte(s) found during client check request
- at 0x........: croak (varinfo6.c:34)
- by 0x........: mainSort (varinfo6.c:2999)
- by 0x........: BZ2_blockSort (varinfo6.c:3143)
- by 0x........: BZ2_compressBlock (varinfo6.c:4072)
- by 0x........: handle_compress (varinfo6.c:4790)
- by 0x........: BZ2_bzCompress (varinfo6.c:4860)
- by 0x........: BZ2_bzBuffToBuffCompress (varinfo6.c:5667)
- by 0x........: main (varinfo6.c:6517)
- Location 0x........ is 2 bytes inside local var "budget"
- declared at varinfo6.c:3115, in frame #2 of thread 1
-
-Uninitialised byte(s) found during client check request
- at 0x........: croak (varinfo6.c:34)
- by 0x........: BZ2_decompress (varinfo6.c:1699)
- by 0x........: BZ2_bzDecompress (varinfo6.c:5230)
- by 0x........: BZ2_bzBuffToBuffDecompress (varinfo6.c:5715)
- by 0x........: main (varinfo6.c:6532)
- Location 0x........ is 2 bytes inside local var "i"
- declared at varinfo6.c:1517, in frame #1 of thread 1
-
-ERROR SUMMARY: 10216 errors from 2 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 10,253 allocs, 10,253 frees, 24,368,716 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
-Use --track-origins=yes to see where uninitialised values come from
Deleted: branches/DARWIN/memcheck/tests/varinfo6.stderr.exp-glibc25-x86
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo6.stderr.exp-glibc25-x86 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo6.stderr.exp-glibc25-x86 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,28 +0,0 @@
-
-Uninitialised byte(s) found during client check request
- at 0x........: croak (varinfo6.c:34)
- by 0x........: mainSort (varinfo6.c:2999)
- by 0x........: BZ2_blockSort (varinfo6.c:3143)
- by 0x........: BZ2_compressBlock (varinfo6.c:4072)
- by 0x........: handle_compress (varinfo6.c:4790)
- by 0x........: BZ2_bzCompress (varinfo6.c:4860)
- by 0x........: BZ2_bzBuffToBuffCompress (varinfo6.c:5667)
- by 0x........: main (varinfo6.c:6517)
- Location 0x........ is 2 bytes inside local var "budget"
- declared at varinfo6.c:3115, in frame #2 of thread 1
-
-Uninitialised byte(s) found during client check request
- at 0x........: croak (varinfo6.c:34)
- by 0x........: BZ2_decompress (varinfo6.c:1699)
- by 0x........: BZ2_bzDecompress (varinfo6.c:5230)
- by 0x........: BZ2_bzBuffToBuffDecompress (varinfo6.c:5715)
- by 0x........: main (varinfo6.c:6532)
- Location 0x........ is 2 bytes inside local var "i"
- declared at varinfo6.c:1517, in frame #1 of thread 1
-
-ERROR SUMMARY: 10216 errors from 2 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 10,253 allocs, 10,253 frees, 24,368,200 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
-Use --track-origins=yes to see where uninitialised values come from
Modified: branches/DARWIN/memcheck/tests/varinfo6.vgtest
===================================================================
--- branches/DARWIN/memcheck/tests/varinfo6.vgtest 2009-04-29 23:21:46 UTC (rev 9681)
+++ branches/DARWIN/memcheck/tests/varinfo6.vgtest 2009-04-29 23:34:10 UTC (rev 9682)
@@ -1,2 +1,2 @@
prog: varinfo6
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q
|