From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 13 Aug 2009 11:22:41 +0000 (+0200)
Subject: test-version-etc, test-argp-version-etc: Fix CRLF issue.  Reduce forks.
X-Git-Tag: v0.1~5665
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=4b05d4e5fa7e1a7affd08576388c08b10bcf8cf0;p=gnulib.git

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

diff --git a/ChangeLog b/ChangeLog
index ba2ed7e92..51938991d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 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
 	project/version.
 
 2009-08-12  Bruno Haible  <bruno@clisp.org>
diff --git a/tests/test-argp-version-etc-1.sh b/tests/test-argp-version-etc-1.sh
index a3fef97e1..fb079ddb1 100755
--- 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 30b017d91..032e10e34 100755
--- 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