Mercurial > hg > octave-lyh > gnulib-hg
changeset 11822:5023d4da7f56
test-version-etc, test-argp-version-etc: Fix CRLF issue. Reduce forks.
author | Simon Josefsson <simon@josefsson.org> |
---|---|
date | Thu, 13 Aug 2009 13:22:41 +0200 |
parents | fb4a525e28c9 |
children | deaaf2799f5d |
files | ChangeLog tests/test-argp-version-etc-1.sh tests/test-version-etc.sh |
diffstat | 3 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-08-13 Simon Josefsson <simon@josefsson.org> + + * tests/test-version-etc.sh: Don't fail on different + project/version. Don't fail on CRLF differences. Rewrite to use + multiple -e instead of multiple sed forks, suggested by Eric Blake + <ebb9@byu.net>. + * tests/test-argp-version-etc-1.sh: Likewise. + 2009-08-13 Simon Josefsson <simon@josefsson.org> * tests/test-version-etc.sh: Don't fail on different
--- a/tests/test-argp-version-etc-1.sh +++ b/tests/test-argp-version-etc-1.sh @@ -32,8 +32,10 @@ EOT ./test-argp-version-etc${EXEEXT} --version | - sed '2s/Copyright (C) [0-9]\{4,4\} Free Software Foundation, Inc\./COPYRIGHT/' | - sed '1s/test-argp-version-etc (.*) .*/test-argp-version-etc (PROJECT) VERSION/' | + sed \ + -e '2s/Copyright (C) [0-9]\{4,4\} Free Software Foundation, Inc\./COPYRIGHT/' \ + -e '1s/test-argp-version-etc (.*) .*/test-argp-version-etc (PROJECT) VERSION/' \ + -e 's/\r//g' | diff -c $TMP - || ERR=1 rm $TMP
--- a/tests/test-version-etc.sh +++ b/tests/test-version-etc.sh @@ -32,8 +32,10 @@ EOT ./test-version-etc${EXEEXT} --version | - sed '2s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' | - sed '1s/test-version-etc (.*) .*/test-version-etc (PROJECT) VERSION/' | + sed \ + -e '2s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' \ + -e '1s/test-version-etc (.*) .*/test-version-etc (PROJECT) VERSION/' \ + -e 's/\r//g' | diff -c $TMP - || ERR=1 rm $TMP