Bug 476331 - clean up generated/distributed filter scripts

diff --git a/NEWS b/NEWS
index e3b115178df57a288e23d7eb940c77010732b23a..e26a226945bbd79ec47d451f50e2c486994c7c92 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 466884  Missing writev uninit padding suppression for _XSend
 475498  Add reallocarray wrapper
 476320  Build failure with GCC
+476331  clean up generated/distributed filter scripts
 476535  Difference in allocation size for massif/tests/overloaded-new between
         clang++/libc++ and g++/libstdc++
 476548  valgrind 3.22.0 fails on assertion when loading debuginfo file produced by mold

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index d26bc685ead129f4e07fa265f4a2828abf294b8c..fc4ccf8079d64d3f86954c49e546ebcf053968f4 100755 (executable)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -4,20 +4,22 @@ include $(top_srcdir)/Makefile.tool-tests.am
 dist_noinst_SCRIPTS =              \
        compare_error_count_with    \
        filter_annotate_barrier_xml \
-       filter_error_count          \
-       filter_error_summary        \
        filter_lambda               \
-       filter_stderr               \
        filter_stderr_and_thread_no \
-       filter_stderr_and_thread_no_and_offset \
        filter_stderr_solaris       \
-       filter_thread_no            \
        filter_thread_name_xml      \
-       filter_xml_and_thread_no    \
        run_openmp_test             \
        supported_libpthread        \
        supported_sem_init
 
+noinst_SCRIPTS = \
+       filter_error_count \
+       filter_error_summary \
+       filter_stderr \
+       filter_stderr_and_thread_no_and_offset \
+       filter_thread_no \
+       filter_xml_and_thread_no
+
 noinst_HEADERS =                                    \
        tsan_thread_wrappers_pthread.h              \
        unified_annotations.h                       \

diff --git a/gdbserver_tests/Makefile.am b/gdbserver_tests/Makefile.am
index fbcb6596d43c65d2b002ff4e04e28293711fa02c..8d2638fb5edeedb3fa50feff3c7088d1ee328e68 100755 (executable)
--- a/gdbserver_tests/Makefile.am
+++ b/gdbserver_tests/Makefile.am
@@ -11,13 +11,20 @@ endif
 DIST_SUBDIRS = solaris
 
 dist_noinst_SCRIPTS = \
-       invoker simulate_control_c make_local_links \
-       filter_gdb filter_make_empty \
-       filter_memcheck_monitor filter_stderr filter_vgdb \
-       filter_helgrind_monitor filter_helgrind_monitor_solaris \
+       invoker simulate_control_c \
+       make_local_links \
+       filter_make_empty \
+       filter_helgrind_monitor \
+       filter_helgrind_monitor_solaris \
        filter_passsigalrm \
        send_signal
 
+noinst_SCRIPTS = \
+       filter_gdb \
+       filter_memcheck_monitor \
+       filter_stderr \
+       filter_vgdb
+
 EXTRA_DIST = \
        README_DEVELOPERS \
        hginfo.stderrB.exp \

diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
index 3e2efad0be3d44ef3f17dd1229101c0d25bfb5a8..28c0793296168608f97bc0c016cb6d4e0035c77a 100755 (executable)
--- a/helgrind/tests/Makefile.am
+++ b/helgrind/tests/Makefile.am
@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/Makefile.tool-tests.am
 
-dist_noinst_SCRIPTS = filter_stderr   \
+dist_noinst_SCRIPTS = \
                      filter_stderr_solaris \
                      filter_helgrind \
                      filter_xml \
@@ -9,6 +9,8 @@ dist_noinst_SCRIPTS = filter_stderr   \
                      filter_stderr_freebsd \
                      filter_bug392331
 
+noinst_SCRIPTS = \
+       filter_stderr
 
 EXTRA_DIST = \
        annotate_hbefore.vgtest annotate_hbefore.stdout.exp \

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 4f70ec2ab6f5b750e1fbdc8900accfd282f83a8f..9bc9a330b4390c36eccfe43217025307e57bd68a 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -72,14 +72,12 @@ DIST_SUBDIRS = x86 amd64 ppc32 ppc64 s390x linux \
 dist_noinst_SCRIPTS = \
        filter_addressable \
        filter_allocs \
-       filter_dw4 \
        filter_leak_cases_possible \
        filter_leak_cpp_interior \
-       filter_stderr filter_xml \
+       filter_xml \
        filter_strchr \
        filter_varinfo3 \
        filter_memcheck \
-       filter_overlaperror \
        filter_malloc_free \
        filter_size_t \
        filter_stanza \
@@ -87,6 +85,11 @@ dist_noinst_SCRIPTS = \
        filter_used_supp \
        filter_stanza_and_size_t
 
+noinst_SCRIPTS = \
+       filter_dw4 \
+       filter_overlaperror \
+       filter_stderr
+
 noinst_HEADERS = leak.h
 
 EXTRA_DIST = \

diff --git a/memcheck/tests/x86/Makefile.am b/memcheck/tests/x86/Makefile.am
index 5753c7ddf5f2408eda7f84fcc534be4aaadd5d13..dc93c85b962d9c47872f77e8e65906e80fb94cfd 100644 (file)
--- a/memcheck/tests/x86/Makefile.am
+++ b/memcheck/tests/x86/Makefile.am
@@ -1,7 +1,9 @@
 
 include $(top_srcdir)/Makefile.tool-tests.am
 
-dist_noinst_SCRIPTS = filter_stderr filter_pushfpopf filter_tronical
+dist_noinst_SCRIPTS = filter_stderr filter_tronical
+
+noinst_SCRIPTS = filter_pushfpopf
 
 INSN_TESTS = insn_basic insn_fpu insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
 

diff --git a/tests/check_makefile_consistency b/tests/check_makefile_consistency
index c51e26ce26bd6070801133f3605b6e5d4b205a69..eb114d8305f8bd84817f6148f88c2164564ce39a 100755 (executable)
--- a/tests/check_makefile_consistency
+++ b/tests/check_makefile_consistency
@@ -83,13 +83,28 @@ do
             rc=1
           fi
         done
-  
+
+        # check that filter files (but nor ones derived from filter*.in) are in dist_noinst_SCRIPTS
         for f in $(ls -d filter* 2>/dev/null | grep -v \.in)
         do
-          if ! echo "${parsed_makefile}" 2>/dev/null | grep '^ *dist_noinst_SCRIPTS *=' |
+          if [ ! -e "$f".in ]; then
+            if ! echo "${parsed_makefile}" 2>/dev/null | grep '^ *dist_noinst_SCRIPTS *=' |
                grep -qw "$f"
+            then
+              echo "$m:1: error: $f is missing in dist_noinst_SCRIPTS"
+              rc=1
+            fi
+          fi
+        done
+        
+        # check that filter files derived from filter*.in are in noinst_SCRIPTS
+        for f in $(ls -d filter*\.in 2>/dev/null )
+        do
+          f2=`echo $f | sed 's/\.in//'`
+          if ! echo "${parsed_makefile}" 2>/dev/null | grep '^ *noinst_SCRIPTS *=' |
+             grep -qw "$f2"
           then
-            echo "$m:1: error: $f is missing in dist_noinst_SCRIPTS"
+            echo "$m:1: error: $f2 is missing in noinst_SCRIPTS"
             rc=1
           fi
         done