test-version-etc, test-argp-version-etc: Fix CRLF issue. Reduce forks.

diff --git a/ChangeLog b/ChangeLog
index ba2ed7e92b1579f5dbc05928cef8dc6847f9de31..51938991d0067ababbd20b45d40a04dea423d057 100644 (file)
--- 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

diff --git a/tests/test-argp-version-etc-1.sh b/tests/test-argp-version-etc-1.sh
index a3fef97e15cc0f1faae7549d6d0a69646b8ebed0..fb079ddb103340daa72381c258b257cadc6e9db9 100755 (executable)
--- a/tests/test-argp-version-etc-1.sh
+++ b/tests/test-argp-version-etc-1.sh
@@ -32,8 +32,10 @@ Written by Sergey Poznyakoff.
 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

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