From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 23 Jan 2009 00:02:07 +0000 (+0000)
Subject: Merge some minor regtest updates from the DARWIN branch:
X-Git-Tag: svn/VALGRIND_3_5_0~1052
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4372b47de89780bb6ed07a1d90e48ddd775ca9da;p=thirdparty%2Fvalgrind.git

Merge some minor regtest updates from the DARWIN branch:
- avoid using <malloc.h> where it's not necessary, because on DARWIN it's
  called <malloc/malloc.h>
- filter the output of brk2 more, which allows the .stderr.exp2 file to be
  removed.



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

diff --git a/memcheck/tests/brk2.stderr.exp b/memcheck/tests/brk2.stderr.exp
index c4aa6f04fe..7a5680c58f 100644
--- a/memcheck/tests/brk2.stderr.exp
+++ b/memcheck/tests/brk2.stderr.exp
@@ -1,7 +1,7 @@
 
 
 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.
+malloc/free: in use at exit: ... bytes in ... blocks.
+malloc/free: ... allocs, ... frees, ... 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/brk2.stderr.exp2 b/memcheck/tests/brk2.stderr.exp2
deleted file mode 100644
index 4944bba7f6..0000000000
--- a/memcheck/tests/brk2.stderr.exp2
+++ /dev/null
@@ -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: 1 allocs, 1 frees, 24 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/brk2.vgtest b/memcheck/tests/brk2.vgtest
index 951b3fabe2..331464e5f1 100644
--- a/memcheck/tests/brk2.vgtest
+++ b/memcheck/tests/brk2.vgtest
@@ -1 +1,2 @@
 prog: brk2
+stderr_filter: filter_allocs
diff --git a/memcheck/tests/origin5-bz2.c b/memcheck/tests/origin5-bz2.c
index 4d90fef315..7c79882d29 100644
--- a/memcheck/tests/origin5-bz2.c
+++ b/memcheck/tests/origin5-bz2.c
@@ -6412,8 +6412,8 @@ void set_inbuf ( void )
   my_strcat(inbuf, "\n");
 }
 
+
 #include <stdio.h>
-#include <malloc.h>
 #include <assert.h>
 
 /* For providing services. */
diff --git a/memcheck/tests/partiallydefinedeq.c b/memcheck/tests/partiallydefinedeq.c
index 871e69303b..888240ea48 100644
--- a/memcheck/tests/partiallydefinedeq.c
+++ b/memcheck/tests/partiallydefinedeq.c
@@ -1,6 +1,6 @@
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 // Do a test comparison.  By default memcheck does not use the
 // expensive EQ/NE scheme as it would be too expensive.  The 
diff --git a/memcheck/tests/varinfo6.c b/memcheck/tests/varinfo6.c
index 01f8d6bd30..2fff8964a1 100644
--- a/memcheck/tests/varinfo6.c
+++ b/memcheck/tests/varinfo6.c
@@ -6449,8 +6449,8 @@ void set_inbuf ( void )
   my_strcat(inbuf, "\n");
 }
 
+
 #include <stdio.h>
-#include <malloc.h>
 #include <assert.h>
 
 /* For providing services. */
diff --git a/memcheck/tests/wrap5.c b/memcheck/tests/wrap5.c
index b544571824..79b475ce49 100644
--- a/memcheck/tests/wrap5.c
+++ b/memcheck/tests/wrap5.c
@@ -1,6 +1,5 @@
 
 #include <stdio.h>
-#include <malloc.h>
 #include <stdlib.h>
 #include "valgrind.h"
 
diff --git a/memcheck/tests/wrap8.c b/memcheck/tests/wrap8.c
index d1a4a5c1a8..10ac129d3f 100644
--- a/memcheck/tests/wrap8.c
+++ b/memcheck/tests/wrap8.c
@@ -1,6 +1,5 @@
 #include <unistd.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <stdlib.h>
 #include "valgrind.h"
 
diff --git a/none/tests/x86/bug137714-x86.c b/none/tests/x86/bug137714-x86.c
index 6849556256..66c0f26722 100644
--- a/none/tests/x86/bug137714-x86.c
+++ b/none/tests/x86/bug137714-x86.c
@@ -1,6 +1,6 @@
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <assert.h>
 
 typedef  unsigned char  UChar;