Merge r9324 (bug152022 portability fix) from the DARWIN branch.

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

diff --git a/memcheck/tests/x86/bug152022.stderr.exp b/memcheck/tests/x86/bug152022.stderr.exp
index c4aa6f04fe5303f75950d57590f65cf38b4a5857..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/memcheck/tests/x86/bug152022.stderr.exp
+++ b/memcheck/tests/x86/bug152022.stderr.exp
@@ -1,7 +0,0 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 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/x86/bug152022.vgtest b/memcheck/tests/x86/bug152022.vgtest
index 4a321ab64fbf1911eb184809a46132d3c288b799..920b1abd26f97cdc9c942ff060889b606fce7de0 100644 (file)
--- a/memcheck/tests/x86/bug152022.vgtest
+++ b/memcheck/tests/x86/bug152022.vgtest
@@ -1 +1,2 @@
 prog: bug152022
+vgopts: -q