# HG changeset patch
# User Simon Josefsson <simon@josefsson.org>
# Date 1250162561 -7200
# Node ID 5023d4da7f56153a3b9b368f5a9cfe6ab4837aab
# Parent  fb4a525e28c9ff241fd95e4afa9054f9bcb9024e
test-version-etc, test-argp-version-etc: Fix CRLF issue.  Reduce forks.

diff --git a/ChangeLog b/ChangeLog
--- 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
--- 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
diff --git a/tests/test-version-etc.sh b/tests/test-version-etc.sh
--- 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