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

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

memcheck/tests/brk2.stderr.exp2

@@ -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

memcheck/tests/brk2.vgtest

@@ -1 +1,2 @@
 prog: brk2
+stderr_filter: filter_allocs

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. */

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 

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. */

memcheck/tests/wrap5.c

@@ -1,6 +1,5 @@
 
 #include <stdio.h>
-#include <malloc.h>
 #include <stdlib.h>
 #include "valgrind.h"
 

memcheck/tests/wrap8.c

@@ -1,6 +1,5 @@
 #include <unistd.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <stdlib.h>
 #include "valgrind.h"
 

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;