I noticed that testsuite.log was including information from every ChangeLog it
could find, even ones that were stale leftovers from `make dist' or `make
distcheck' directories nested under $srcdir. OK to apply this patch?
From: Eric Blake <[EMAIL PROTECTED]>
Date: Thu, 18 Oct 2007 11:01:14 -0600
Subject: [PATCH] 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 <[EMAIL PROTECTED]>
---
ChangeLog | 4 ++++
lib/autotest/general.m4 | 7 +++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 483e6db..94f94a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-10-18 Eric Blake <[EMAIL PROTECTED]>
+ 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 9335874..abed58f 100644
--- 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
--
1.5.3.2
