Ignore `make dist' changelogs in testsuite.log.

* lib/autotest/general.m4 (AT_INIT) <ChangeLogs>: Prune
directories matching AT_PACKAGE_TARNAME-*.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 483e6db41d3772c7fc6009fd120c8aeb9e8b9e5e..94f94a3fa9e8d74dc2f177da3ee00377fa1f89bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-10-18  Eric Blake  <ebb9@byu.net>
 
+       Ignore `make dist' changelogs in testsuite.log.
+       * lib/autotest/general.m4 (AT_INIT) <ChangeLogs>: Prune
+       directories matching AT_PACKAGE_TARNAME-*.
+
        Fix AT_TESTED, AT_KEYWORDS.
        * lib/m4sugar/m4sugar.m4 (m4_append_uniq): Warn if separator
        occurs in string, as duplicates may be added.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 933587495eb76bd06c57fd2e16df8c113e1b2290..abed58fa210e86f12467b8a90f1456bd296d9eaa 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -744,11 +744,14 @@ AS_BOX(m4_defn([AT_TESTSUITE_NAME])[.])
   # Try to find a few ChangeLogs in case it might help determining the
   # exact version.  Use the relative dir: if the top dir is a symlink,
   # find will not follow it (and options to follow the links are not
-  # portable), which would result in no output here.
+  # portable), which would result in no output here.  Prune directories
+  # matching the package tarname, since they tend to be leftovers from
+  # `make dist' or `make distcheck' and contain redundant or stale logs.
   if test -n "$at_top_srcdir"; then
     AS_BOX([ChangeLogs.])
     echo
-    for at_file in `find "$at_top_srcdir" -name ChangeLog -print`
+    for at_file in `find "$at_top_srcdir" m4_ifdef([AT_PACKAGE_TARNAME],
+[-name "AT_PACKAGE_TARNAME-*" -prune -o ])-name ChangeLog -print`
     do
       AS_ECHO(["$as_me: $at_file:"])
       sed 's/^/| /;10q' $at_file