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 c4aa6f04fe5303f75950d57590f65cf38b4a5857..7a5680c58f8576c82bcb5a2abf7d4cf18e3eac71 100644 (file)
--- 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 (file)
index 4944bba..0000000
--- 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 951b3fabe20d28bf1083eca60c4a6337f8ceb4f1..331464e5f19fae928a959f7e7b137d099d40a9b6 100644 (file)
--- 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 4d90fef3157a17e9eacb6f3ebbaff61e475e5745..7c79882d29f7aed7527cadee004ff69402b47d99 100644 (file)
--- 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 871e69303ba1ce5c389902eb20ef1c6af40c9362..888240ea486a79b757b3dee8ac60db3d026dea0e 100644 (file)
--- 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 01f8d6bd306a11db22a3d8184d7b677074a6ca11..2fff8964a1645fe80c3c6c93edaad71d5c5968e5 100644 (file)
--- 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 b544571824a243eeef7fdd5e672ca78c76db3bdc..79b475ce4915ec68dbf4e25dd3bcadff7b906c20 100644 (file)
--- 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 d1a4a5c1a8527239d5da6994ec85ef1154bcac30..10ac129d3f0541766bb302b593580e92bbd9a1e6 100644 (file)
--- 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 684955625648e582494c1a69c1977dcde5616b2d..66c0f267220764cf4ccf6998fb4d402e00c75b72 100644 (file)
--- 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;