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>

diff --git a/ChangeLog b/ChangeLog
index 8fe14032241d097525f3db6ab85c6c396afac86d..960f3cc42c2e63b794181309949b2b096f8cbeae 100644 (file)
--- 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.

diff --git a/tests/test-argp-version-etc-1.sh b/tests/test-argp-version-etc-1.sh
index fb079ddb103340daa72381c258b257cadc6e9db9..d1a14e619e8f66191c1c6cbb9bf9c627d7afb8ab 100755 (executable)
--- a/tests/test-argp-version-etc-1.sh
+++ b/tests/test-argp-version-etc-1.sh
@@ -23,7 +23,7 @@ ERR=0
 
 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 @@ Written by Sergey Poznyakoff.
 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

diff --git a/tests/test-version-etc.sh b/tests/test-version-etc.sh
index 032e10e34e43a53bcb8714b5369aa3a777c052fb..528fadd9ece388c770849526529d6a8e0e2c3422 100755 (executable)
--- a/tests/test-version-etc.sh
+++ b/tests/test-version-etc.sh
@@ -32,10 +32,9 @@ Written by Sergey Poznyakoff and Eric Blake.
 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