Move memcheck/tests/brk to the linux/ subdir, as it's Linux-specific (merged

from the DARWIN branch).  Also filter the output more so the .stderr.exp2
isn't needed.



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

memcheck/tests/Makefile.am

@@ -39,7 +39,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 	badloop.stderr.exp badloop.vgtest \
 	badpoll.stderr.exp badpoll.vgtest \
 	badrw.stderr.exp badrw.vgtest \
-	brk.stderr.exp brk.vgtest \
 	brk2.stderr.exp brk2.vgtest \
 	buflen_check.stderr.exp buflen_check.stderr.exp2 buflen_check.vgtest \
 	clientperm.stderr.exp \
@@ -186,7 +185,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 check_PROGRAMS = \
 	addressable \
 	badaddrvalue badfree badjump badjump2 \
-	badloop badpoll badrw brk brk2 buflen_check \
+	badloop badpoll badrw brk2 buflen_check \
 	clientperm custom_alloc \
 	deep_templates \
 	describe-block \

memcheck/tests/brk.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/brk.vgtest

@@ -1 +0,0 @@
-prog: brk

memcheck/tests/linux/Makefile.am

@@ -1,10 +1,12 @@
 noinst_SCRIPTS = filter_stderr
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
+	brk.stderr.exp brk.vgtest \
 	capget capget.stderr.exp \
 	timerfd-syscall timerfd-syscall.stderr.exp
 
 check_PROGRAMS = \
+	brk \
 	capget \
 	timerfd-syscall
 

memcheck/tests/linux/brk.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/linux/brk.vgtest

@@ -0,0 +1,2 @@
+prog: brk
+stderr_filter: ../filter_allocs