From dbcc3e99d6b4dd021b6c73eaca0575e00a4b9964 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 23 Jan 2009 00:57:31 +0000
Subject: [PATCH] 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                | 3 +--
 memcheck/tests/brk.stderr.exp2            | 7 -------
 memcheck/tests/brk.vgtest                 | 1 -
 memcheck/tests/linux/Makefile.am          | 2 ++
 memcheck/tests/{ => linux}/brk.c          | 0
 memcheck/tests/{ => linux}/brk.stderr.exp | 4 ++--
 memcheck/tests/linux/brk.vgtest           | 2 ++
 7 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 memcheck/tests/brk.stderr.exp2
 delete mode 100644 memcheck/tests/brk.vgtest
 rename memcheck/tests/{ => linux}/brk.c (100%)
 rename memcheck/tests/{ => linux}/brk.stderr.exp (60%)
 create mode 100644 memcheck/tests/linux/brk.vgtest

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index ebc0d28c82..f8a6e82b6d 100644
--- a/memcheck/tests/Makefile.am
+++ b/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 \
diff --git a/memcheck/tests/brk.stderr.exp2 b/memcheck/tests/brk.stderr.exp2
deleted file mode 100644
index 4944bba7f6..0000000000
--- a/memcheck/tests/brk.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/brk.vgtest b/memcheck/tests/brk.vgtest
deleted file mode 100644
index b1766ffc38..0000000000
--- a/memcheck/tests/brk.vgtest
+++ /dev/null
@@ -1 +0,0 @@
-prog: brk
diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am
index bd713e1679..93fc4c79dc 100644
--- a/memcheck/tests/linux/Makefile.am
+++ b/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
 
diff --git a/memcheck/tests/brk.c b/memcheck/tests/linux/brk.c
similarity index 100%
rename from memcheck/tests/brk.c
rename to memcheck/tests/linux/brk.c
diff --git a/memcheck/tests/brk.stderr.exp b/memcheck/tests/linux/brk.stderr.exp
similarity index 60%
rename from memcheck/tests/brk.stderr.exp
rename to memcheck/tests/linux/brk.stderr.exp
index c4aa6f04fe..7a5680c58f 100644
--- a/memcheck/tests/brk.stderr.exp
+++ b/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
diff --git a/memcheck/tests/linux/brk.vgtest b/memcheck/tests/linux/brk.vgtest
new file mode 100644
index 0000000000..29006985b4
--- /dev/null
+++ b/memcheck/tests/linux/brk.vgtest
@@ -0,0 +1,2 @@
+prog: brk
+stderr_filter: ../filter_allocs
-- 
2.47.3