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., "<bug-tar@gnu.org>".  Filter out any address.

diff --git a/ChangeLog b/ChangeLog
index 5c1e86741841f466c92f78cb522b7a3810a73080..a61d05bcb897fb7e1a8f18387772fb398af584f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-13  Jim Meyering  <meyering@redhat.com>
+
+       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., "<bug-tar@gnu.org>".  Filter out any address.
+
 2008-11-12  Bruno Haible  <bruno@clisp.org>
 
        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 39132bc4c8103a18d372cf8d53877c89f28e417c..93abb5236be5a18f1aee91f1fc5aa63662ac110d 100755 (executable)
--- 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