Including gnulib-tests in tar, I hit a spurious failure.
This fixes it.
>From 6d9934c39304a25f6b45950af4cd8d602f0694e9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[EMAIL PROTECTED]>
Date: Thu, 13 Nov 2008 11:31:01 +0100
Subject: [PATCH] test-argp-2: avoid test failure when PACKAGE_BUGREPORT is
defined
* tests/test-argp-2.sh: When PACKAGE_BUGREPORT was defined, this
test would fail due to the difference in the Report bugs to ...
line. The expected address is empty, "<>", while the actual
would contain e.g., "<[EMAIL PROTECTED]>". Filter out any address.
---
ChangeLog | 8 ++++++++
tests/test-argp-2.sh | 4 +++-
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5c1e867..a61d05b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-13 Jim Meyering <[EMAIL PROTECTED]>
+
+ test-argp-2: avoid test failure when PACKAGE_BUGREPORT is defined
+ * tests/test-argp-2.sh: When PACKAGE_BUGREPORT was defined, this
+ test would fail due to the difference in the Report bugs to ...
+ line. The expected address is empty, "<>", while the actual
+ would contain e.g., "<[EMAIL PROTECTED]>". Filter out any address.
+
2008-11-12 Bruno Haible <[EMAIL PROTECTED]>
lstat: don't compile lstat.c on systems lacking lstat
diff --git a/tests/test-argp-2.sh b/tests/test-argp-2.sh
index 39132bc..93abb52 100755
--- a/tests/test-argp-2.sh
+++ b/tests/test-argp-2.sh
@@ -93,7 +93,9 @@ for any corresponding short options.
Report bugs to <>.
EOT
-./test-argp$EXEEXT --help | func_compare || ERR=1
+# Compare --help output, but filter out any bug-reporting email address.
+./test-argp$EXEEXT --help \
+ | sed 's/^\(Report bugs to \)<[^>]*>.$/\1<>./' | func_compare || ERR=1
####
# Test ambiguous option handling
--
1.6.0.4.879.g9d19a
