Mercurial > hg > octave-kai > gnulib-hg
changeset 11824:69c3e283e8de
test-version-etc: fix CRLF portability issue
* tests/test-version-etc.sh: Use tr, not sed, as not all sed
recognize \r.
* tests/test-argp-version-etc-1.sh: Likewise.
Signed-off-by: Eric Blake <ebb9@byu.net>
author | Eric Blake <ebb9@byu.net> |
---|---|
date | Thu, 13 Aug 2009 11:22:26 -0600 |
parents | deaaf2799f5d |
children | dcb923072f09 |
files | ChangeLog tests/test-argp-version-etc-1.sh tests/test-version-etc.sh |
diffstat | 3 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-08-13 Eric Blake <ebb9@byu.net> + test-version-etc: fix CRLF portability issue + * tests/test-version-etc.sh: Use tr, not sed, as not all sed + recognize \r. + * tests/test-argp-version-etc-1.sh: Likewise. + getopt: update client modules * modules/argp (Depends-on): Use getopt-gnu. * modules/git-merge-changelog (Depends-on): Likewise.
--- a/tests/test-argp-version-etc-1.sh +++ b/tests/test-argp-version-etc-1.sh @@ -23,7 +23,7 @@ cat > $TMP <<EOT test-argp-version-etc (PROJECT) VERSION -COPYRIGHT +COPYRIGHT Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -32,10 +32,9 @@ EOT ./test-argp-version-etc${EXEEXT} --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' | + sed '1s/test-argp-version-etc (.*) .*/test-argp-version-etc (PROJECT) VERSION/ + 2s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' | + tr -d '\015' | diff -c $TMP - || ERR=1 rm $TMP
--- a/tests/test-version-etc.sh +++ b/tests/test-version-etc.sh @@ -32,10 +32,9 @@ EOT ./test-version-etc${EXEEXT} --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' | + sed '1s/test-version-etc (.*) .*/test-version-etc (PROJECT) VERSION/ + 2s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' | + tr -d '\015' | diff -c $TMP - || ERR=1 rm $TMP