Mercurial > hg > octave-lojdl > gnulib-hg
changeset 12318:0661ed228251
tests: avoid false negative with --with-packager
Ignore extra line produced by version-etc.
* tests/test-version-etc.sh: Discard packager information.
* tests/test-argp-version-etc-1.sh: Likewise.
Reported by Mike Frysinger.
Signed-off-by: Eric Blake <ebb9@byu.net>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Wed, 18 Nov 2009 20:36:01 -0700 |
| parents | 407921985bc0 |
| children | 02b65a16c35d |
| files | ChangeLog tests/test-argp-version-etc-1.sh tests/test-version-etc.sh |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-11-18 Eric Blake <ebb9@byu.net> + tests: avoid false negative with --with-packager + * tests/test-version-etc.sh: Discard packager information. + * tests/test-argp-version-etc-1.sh: Likewise. + Reported by Mike Frysinger. + utimens: fix regression on Solaris * m4/utimens.m4 (gl_UTIMENS): Check for BSD bug. * lib/utimens.c (fdutimens): Revert 2009-11-08 change; Solaris 10
--- a/tests/test-argp-version-etc-1.sh +++ b/tests/test-argp-version-etc-1.sh @@ -33,7 +33,8 @@ ./test-argp-version-etc${EXEEXT} --version | sed '1s/test-argp-version-etc (.*) .*/test-argp-version-etc (PROJECT) VERSION/ - 2s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' | + /^Packaged by/d + 2,3 s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' | tr -d '\015' | diff -c $TMP - || ERR=1
--- a/tests/test-version-etc.sh +++ b/tests/test-version-etc.sh @@ -33,7 +33,8 @@ ./test-version-etc${EXEEXT} --version | sed '1s/test-version-etc (.*) .*/test-version-etc (PROJECT) VERSION/ - 2s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' | + /^Packaged by/d + 2,3 s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' | tr -d '\015' | diff -c $TMP - || ERR=1