Use -q on varinfo tests to avoid platform-specific differences in number of

allocations.  This allowed two .stderr.exp files to be merged for varinfo6.

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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 72a432ee3cacd4103ad8851b398add638f2f2f26..e83633d83969964c1e4a364ae302fdb31533a2f1 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -156,8 +156,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        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 \

diff --git a/memcheck/tests/varinfo1.stderr.exp b/memcheck/tests/varinfo1.stderr.exp
index fdcf88045a213d05f4133417793165f471cd4d42..3c77f3f1c0199c9405787f7977f5261e2251ea0f 100644 (file)
--- a/memcheck/tests/varinfo1.stderr.exp
+++ b/memcheck/tests/varinfo1.stderr.exp
@@ -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 @@ Uninitialised byte(s) found during client check request
    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

diff --git a/memcheck/tests/varinfo1.vgtest b/memcheck/tests/varinfo1.vgtest
index f1ff6fb3b4bfc2b156315b456f707d484d6a1289..b5c885832e23bb29fc90deefc265db49399d57de 100644 (file)
--- a/memcheck/tests/varinfo1.vgtest
+++ b/memcheck/tests/varinfo1.vgtest
@@ -1,2 +1,2 @@
 prog: varinfo1
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q

diff --git a/memcheck/tests/varinfo2.stderr.exp b/memcheck/tests/varinfo2.stderr.exp
index 2da12f617a3fa2b69b1f23a832233b3603ca867a..68c03e5762b69917d7d04608c546c21377104ef0 100644 (file)
--- a/memcheck/tests/varinfo2.stderr.exp
+++ b/memcheck/tests/varinfo2.stderr.exp
@@ -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 @@ Uninitialised byte(s) found during client check request
    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

diff --git a/memcheck/tests/varinfo2.vgtest b/memcheck/tests/varinfo2.vgtest
index 61ef4dd7ab3525de2dea4a7f48a20e06e501f293..e64c322ff13dc1567719a5096e327d2b454aaa65 100644 (file)
--- a/memcheck/tests/varinfo2.vgtest
+++ b/memcheck/tests/varinfo2.vgtest
@@ -1,2 +1,2 @@
 prog: varinfo2
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q

diff --git a/memcheck/tests/varinfo3.stderr.exp b/memcheck/tests/varinfo3.stderr.exp
index 46aa116ddf896b3ee197f030b113157d912ace63..fa6633b1d0fa43e219046b9d09e91f29625e4156 100644 (file)
--- a/memcheck/tests/varinfo3.stderr.exp
+++ b/memcheck/tests/varinfo3.stderr.exp
@@ -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 @@ Uninitialised byte(s) found during client check request
    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

diff --git a/memcheck/tests/varinfo3.vgtest b/memcheck/tests/varinfo3.vgtest
index 2b827cfd0d80d7ea389c7c2620ff4e97e091bf3d..37cae06c31f5ec0bb5eb65855263f5763d59f234 100644 (file)
--- a/memcheck/tests/varinfo3.vgtest
+++ b/memcheck/tests/varinfo3.vgtest
@@ -1,3 +1,3 @@
 prog: varinfo3
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q
 stderr_filter: filter_varinfo3

diff --git a/memcheck/tests/varinfo4.stderr.exp b/memcheck/tests/varinfo4.stderr.exp
index ce55101bdf034974c2567f32982cfdfd9d6c3221..4a671ed094fded2b8755057e6cb8d53d77049240 100644 (file)
--- a/memcheck/tests/varinfo4.stderr.exp
+++ b/memcheck/tests/varinfo4.stderr.exp
@@ -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 @@ Uninitialised byte(s) found during client check request
    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

diff --git a/memcheck/tests/varinfo4.vgtest b/memcheck/tests/varinfo4.vgtest
index cd72fb2993c11bb56e9e3c0e8d0fbc7824e7b9f9..a9531e9f4fc483f7980ed3edba91d1c3867f233c 100644 (file)
--- a/memcheck/tests/varinfo4.vgtest
+++ b/memcheck/tests/varinfo4.vgtest
@@ -1,2 +1,2 @@
 prog: varinfo4
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q

diff --git a/memcheck/tests/varinfo5.stderr.exp b/memcheck/tests/varinfo5.stderr.exp
index 160fa9ba66db4a2a3e78413fd766f8d4191c105d..4f8ed1f9acb7d5150d77fe33efac65435add9cd7 100644 (file)
--- a/memcheck/tests/varinfo5.stderr.exp
+++ b/memcheck/tests/varinfo5.stderr.exp
@@ -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 @@ Uninitialised byte(s) found during client check request
  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

diff --git a/memcheck/tests/varinfo5.vgtest b/memcheck/tests/varinfo5.vgtest
index 5fda7c4089359e1e27ae4392f3c575f4d85bed9c..1213243cb1afac5893a8b46d967a39ddc78dbec2 100644 (file)
--- a/memcheck/tests/varinfo5.vgtest
+++ b/memcheck/tests/varinfo5.vgtest
@@ -1,3 +1,3 @@
 prog: varinfo5
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q
 stderr_filter: filter_varinfo3

diff --git a/memcheck/tests/varinfo6.stderr.exp-glibc25-amd64 b/memcheck/tests/varinfo6.stderr.exp
similarity index 72%
rename from memcheck/tests/varinfo6.stderr.exp-glibc25-amd64
rename to memcheck/tests/varinfo6.stderr.exp
index 5edfd2d8b736fd308913b207420d7e77e71713cc..6436cbb82fcf4950c65f33492fac79bf2cd81cc8 100644 (file)
--- a/memcheck/tests/varinfo6.stderr.exp-glibc25-amd64
+++ b/memcheck/tests/varinfo6.stderr.exp
@@ -1,4 +1,3 @@
-
 Uninitialised byte(s) found during client check request
    at 0x........: croak (varinfo6.c:34)
    by 0x........: mainSort (varinfo6.c:2999)
@@ -19,10 +18,3 @@ Uninitialised byte(s) found during client check request
    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

diff --git a/memcheck/tests/varinfo6.stderr.exp-glibc25-x86 b/memcheck/tests/varinfo6.stderr.exp-glibc25-x86
deleted file mode 100644 (file)
index fa00e56..0000000
--- a/memcheck/tests/varinfo6.stderr.exp-glibc25-x86
+++ /dev/null
@@ -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

diff --git a/memcheck/tests/varinfo6.vgtest b/memcheck/tests/varinfo6.vgtest
index b67a27b12791c17cd8d2a939ef9cac4a4dd3b726..8855247a475832468d43ca0ba98dd3c03507f821 100644 (file)
--- a/memcheck/tests/varinfo6.vgtest
+++ b/memcheck/tests/varinfo6.vgtest
@@ -1,2 +1,2 @@
 prog: varinfo6
-vgopts: --read-var-info=yes
+vgopts: --read-var-info=yes -q