Regtest: rationalize filters for new/delete

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index e5b2ae58633f325cf5255ad9e2e07407a95f68a6..55eea450b90e98a08d409278a83960cabf256746 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -80,8 +80,7 @@ dist_noinst_SCRIPTS = \
        filter_varinfo3 \
        filter_memcheck \
        filter_overlaperror \
-       filter_malloc_free \
-        filter_sized_delete
+       filter_malloc_free
 
 noinst_HEADERS = leak.h
 

diff --git a/memcheck/tests/filter_sized_delete b/memcheck/tests/filter_sized_delete
deleted file mode 100755 (executable)
index 54dea76..0000000
--- a/memcheck/tests/filter_sized_delete
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-./filter_stderr "$@" |
-grep -v free | grep -v malloc

diff --git a/memcheck/tests/sized_delete.vgtest b/memcheck/tests/sized_delete.vgtest
index 9f483e01c4778fc2caf3c8906b7c7bce6ee875a6..1ad6b68f3a8635c5aefa67f6995ab3a5549b6bd3 100644 (file)
--- a/memcheck/tests/sized_delete.vgtest
+++ b/memcheck/tests/sized_delete.vgtest
@@ -1,4 +1,4 @@
 prog: sized_delete
 prereq: test -e sized_delete
 vgopts: -q "--trace-malloc=yes" --show-mismatched-frees=yes 
-stderr_filter: filter_sized_delete
+stderr_filter: filter_malloc_free