From: Ivo Raisr <ivosh@ivosh.net>
Date: Wed, 18 Nov 2015 04:13:12 +0000 (+0000)
Subject: Expected stderr of test cases wrapmalloc and wrapmallocstatic are overconstrained.
X-Git-Tag: svn/VALGRIND_3_12_0~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68c788c973aa36d4ff23e6549f7ffa606639aac6;p=thirdparty%2Fvalgrind.git

Expected stderr of test cases wrapmalloc and wrapmallocstatic are overconstrained.
Fixes BZ#355455.


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

diff --git a/NEWS b/NEWS
index 311a39594d..abcc502377 100644
--- a/NEWS
+++ b/NEWS
@@ -51,6 +51,7 @@ where XXXXXX is the bug number as listed below.
 354797  Added vbit tester support for PPC 64 isa 2.07 iops
 354933  Fix documentation of --kernel-variant=android-no-hw-tls option
 355188  valgrind should intercept all malloc related global functions
+355455  expected stderr of test cases wrapmalloc and wrapmallocstatic overconstrained
 
 
 Release 3.11.0 (22 September 2015)
diff --git a/memcheck/tests/wrapmalloc.stderr.exp b/memcheck/tests/wrapmalloc.stderr.exp
index d9377763e5..e69de29bb2 100644
--- a/memcheck/tests/wrapmalloc.stderr.exp
+++ b/memcheck/tests/wrapmalloc.stderr.exp
@@ -1,10 +0,0 @@
-
-
-HEAP SUMMARY:
-    in use at exit: 0 bytes in 0 blocks
-  total heap usage: 1 allocs, 1 frees, 1,024 bytes allocated
-
-For a detailed leak analysis, rerun with: --leak-check=full
-
-For counts of detected and suppressed errors, rerun with: -v
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/memcheck/tests/wrapmalloc.vgtest b/memcheck/tests/wrapmalloc.vgtest
index a6dff4ef8f..c22f241642 100644
--- a/memcheck/tests/wrapmalloc.vgtest
+++ b/memcheck/tests/wrapmalloc.vgtest
@@ -1,2 +1,2 @@
 prog: wrapmalloc
-
+vgopts: -q
diff --git a/memcheck/tests/wrapmallocstatic.stderr.exp b/memcheck/tests/wrapmallocstatic.stderr.exp
index d9377763e5..e69de29bb2 100644
--- a/memcheck/tests/wrapmallocstatic.stderr.exp
+++ b/memcheck/tests/wrapmallocstatic.stderr.exp
@@ -1,10 +0,0 @@
-
-
-HEAP SUMMARY:
-    in use at exit: 0 bytes in 0 blocks
-  total heap usage: 1 allocs, 1 frees, 1,024 bytes allocated
-
-For a detailed leak analysis, rerun with: --leak-check=full
-
-For counts of detected and suppressed errors, rerun with: -v
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/memcheck/tests/wrapmallocstatic.vgtest b/memcheck/tests/wrapmallocstatic.vgtest
index 7b3c068235..f040756224 100644
--- a/memcheck/tests/wrapmallocstatic.vgtest
+++ b/memcheck/tests/wrapmallocstatic.vgtest
@@ -1,2 +1,2 @@
 prog: wrapmallocstatic
-
+vgopts: -q