[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
more version-etc test fixes
From: |
Simon Josefsson |
Subject: |
more version-etc test fixes |
Date: |
Thu, 13 Aug 2009 13:23:27 +0200 |
User-agent: |
Gnus/5.110011 (No Gnus v0.11) Emacs/23.1.50 (gnu/linux) |
It seems it failed on CRLF differences too. Pushed. Also uses multiple
-e instead of multiple sed, which I recall Eric suggested out earlier.
/Simon
>From 4b05d4e5fa7e1a7affd08576388c08b10bcf8cf0 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Thu, 13 Aug 2009 13:22:41 +0200
Subject: [PATCH] test-version-etc, test-argp-version-etc: Fix CRLF issue.
Reduce forks.
---
ChangeLog | 8 ++++++++
tests/test-argp-version-etc-1.sh | 6 ++++--
tests/test-version-etc.sh | 6 ++++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ba2ed7e..5193899 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
2009-08-13 Simon Josefsson <address@hidden>
* 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
+ <address@hidden>.
+ * tests/test-argp-version-etc-1.sh: Likewise.
+
+2009-08-13 Simon Josefsson <address@hidden>
+
+ * tests/test-version-etc.sh: Don't fail on different
project/version.
2009-08-12 Bruno Haible <address@hidden>
diff --git a/tests/test-argp-version-etc-1.sh b/tests/test-argp-version-etc-1.sh
index a3fef97..fb079dd 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 30b017d..032e10e 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
--
1.6.3.3
- more version-etc test fixes,
Simon Josefsson <=