Regtest: remove duplicate filters

filter_stanza and filter_stanza_and_size_t were doing the same thing.
Keep the one with a short name.

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 5acc8d0662ab28d0128b9f90e0de184d121b66e0..5e31dbb37d46af29821eb0ed083ea8f5b9c5b394 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -95,7 +95,6 @@ dist_noinst_SCRIPTS = \
        filter_stanza \
        filter_stanza.awk \
        filter_used_supp \
-       filter_stanza_and_size_t \
        filter_malloc_zone \
        run_descr_belowsp_test
 

diff --git a/memcheck/tests/filter_stanza_and_size_t b/memcheck/tests/filter_stanza_and_size_t
deleted file mode 100755 (executable)
index fe3691a..0000000
--- a/memcheck/tests/filter_stanza_and_size_t
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-
-./filter_stanza "$@" |
-sed "s/unsigned int/unsigned long/;s/4294967295/18446744073709551615/"
-

diff --git a/memcheck/tests/sized_aligned_new_delete_args.vgtest b/memcheck/tests/sized_aligned_new_delete_args.vgtest
index 291efa5f60a338def402cd85841e348cb4b311c3..282a4bcc8103b022468a9df75f279ee5ac248021 100644 (file)
--- a/memcheck/tests/sized_aligned_new_delete_args.vgtest
+++ b/memcheck/tests/sized_aligned_new_delete_args.vgtest
@@ -1,4 +1,4 @@
 prog: sized_aligned_new_delete_args
 prereq: test -e ./sized_aligned_new_delete_args
 vgopts: -q
-stderr_filter: filter_stanza_and_size_t
+stderr_filter: filter_stanza