From: Jim Meyering Date: Thu, 13 Nov 2008 10:31:01 +0000 (+0100) Subject: test-argp-2: avoid test failure when PACKAGE_BUGREPORT is defined X-Git-Tag: v0.1~6681 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=dcf2cb3d3a2448090e6801f1a6f91edd36f7c781;p=gnulib.git 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., "". Filter out any address. --- diff --git a/ChangeLog b/ChangeLog index 5c1e86741..a61d05bcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-11-13 Jim Meyering + + 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., "". Filter out any address. + 2008-11-12 Bruno Haible 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 39132bc4c..93abb5236 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