[Findutils-patches] [PATCH 3/4] Check there are no duplicate configuration entries for test files.

[James Youngman]

* find/testsuite/Makefile.am (EXTRA_DIST_XO): Remove duplicate items.
(EXTRA_DIST_EXP): Likewise.
(checklists): Run with the other checks, using check-local.  Don't
echo the full command, because it will make the summary of the
Automake-driven tests scroll offscreen.
(TEST_EXTENSIONS): Add .sh and .py.
---
 ChangeLog                  |    8 ++++++++
 find/testsuite/Makefile.am |   28 ++++++++--------------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da3601d..9297aa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,14 @@
        parallel-tests.  This will only include tests known directly via
        $(TESTS), not DejaGnu tests.
 
+       Check there are no duplicate configuration entries for test files.
+       * find/testsuite/Makefile.am (EXTRA_DIST_XO): Remove duplicate items.
+       (EXTRA_DIST_EXP): Likewise.
+       (checklists): Run with the other checks, using check-local.  Don't
+       echo the full command, because it will make the summary of the
+       Automake-driven tests scroll offscreen.
+       (TEST_EXTENSIONS): Add .sh and .py.
+
 2014-05-25  Eric S. Raymond  <address@hidden>
 
        Fix errant backslash in find manpage.
diff --git a/find/testsuite/Makefile.am b/find/testsuite/Makefile.am
index 94f25e2..70b84c0 100644
--- a/find/testsuite/Makefile.am
+++ b/find/testsuite/Makefile.am
@@ -84,7 +84,6 @@ find.posix/sv-bug-11175.xo \
 find.posix/sv-bug-12181.xo \
 find.posix/sv-bug-25359.xo \
 find.posix/sv-bug-27563-exec.xo \
-find.posix/depth1.xo \
 find.posix/mtime0.xo \
 find.posix/sizes.xo \
 find.posix/name.xo \
@@ -96,18 +95,11 @@ find.posix/posixnot.xo \
 find.posix/prune.xo \
 find.posix/prune-result.xo \
 find.posix/prune-stat.xo \
-find.posix/sizes.xo \
 find.posix/sizetype.xo \
-find.posix/sv-bug-11175.xo \
-find.posix/sv-bug-12181.xo \
 find.posix/sv-bug-15235.xo \
 find.posix/sv-bug-19613.xo \
-find.posix/typesize.xo \
-find.posix/posixnot.xo \
-find.posix/grouping.xo \
-find.posix/and.xo \
-find.posix/exec-one.xo \
-find.gnu/follow-arg-parent-symlink.xo
+find.posix/typesize.xo
+
 
 EXTRA_DIST_EXP = \
 config/unix.exp \
@@ -165,7 +157,6 @@ find.gnu/posix-l.exp \
 find.gnu/posix-perminvalid.exp \
 find.gnu/printfHdfl.exp \
 find.gnu/printf.exp \
-find.gnu/printf.exp \
 find.gnu/printf-nonlocal-symlink.exp \
 find.gnu/printf-slash.exp \
 find.gnu/printf-symlink.exp \
@@ -214,7 +205,6 @@ find.posix/sv-bug-12181.exp \
 find.posix/sv-bug-25359.exp \
 find.posix/sv-bug-27563-exec.exp \
 find.posix/sv-bug-30777.exp \
-find.posix/depth1.exp \
 find.posix/sizes.exp \
 find.posix/name.exp \
 find.posix/nameslash.exp \
@@ -227,19 +217,13 @@ find.posix/prune-result.exp \
 find.posix/prune-stat.exp \
 find.posix/size-invalid.exp \
 find.posix/size-missing.exp \
-find.posix/sizes.exp \
 find.posix/sizetype.exp \
 find.posix/typearg.exp \
-find.posix/sv-bug-11175.exp \
-find.posix/sv-bug-12181.exp \
 find.posix/sv-bug-15235.exp \
 find.posix/sv-bug-19605.exp \
 find.posix/sv-bug-19613.exp \
 find.posix/sv-bug-19617.exp \
 find.posix/typesize.exp \
-find.posix/grouping.exp \
-find.posix/and.exp \
-find.posix/exec-one.exp \
 find.posix/user-empty.exp \
 find.posix/user-missing.exp
 
@@ -263,10 +247,14 @@ CLEANFILES = *.log *.sum site.exp site.bak
 
 
 TESTS = $(test_shell_progs)
+TEST_EXTENSIONS = .sh .py
+
+check-local: checklists
 
 checklists:
-       cd $(srcdir) && \
+       @cd $(srcdir) && \
        ( find config find.gnu find.posix \( -name "*.exp" -o -name "*.xo" \) 
-print ; \
          ls $(EXTRA_DIST_XO)  ; \
          ls  $(EXTRA_DIST_EXP)  ; ) | \
-       sort | uniq -c | awk '$$1 != 2 { print; }'
+       sort | uniq -c | \
+       awk '$$1 != 2 { print; fail=1; } END { if (fail) { print "FAIL: 
Duplicate test files"; exit(1); } }'
-- 
1.7.10.4