Use sed instead, it comes with cygwin and there is almost no chance of
someone installing a sed with default CRLF lineendings by accident.
Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx>
---
I have been seeing failures in the t800x tests from the beginning on, I
believe. Today they annoyed me enough to get them fixed.
The reason of the failures is the usual one: for reasons unexplainable
activestate perl defaults to CRLF lineendings in all output, which in the
testcase changes the whole file.
t/annotate-tests.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
From c242c7ea07d98ddfb45961b52f5975d0297f9781 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@xxxxxxxxx>
Date: Mon, 5 Feb 2007 14:04:09 +0100
Subject: [PATCH] Avoid ActiveState Perl IO in t800[12]
Use sed instead, it comes with cygwin and there is almost no chance of
someone installing a sed with default CRLF lineendings by accident.
Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx>
---
I have been seeing failures in the t800x tests from the beginning on, I
believe. Today they annoyed me enough to get them fixed.
The reason of the failures is the usual one: for reasons unexplainable
activestate perl defaults to CRLF lineendings in all output, which in the
testcase changes the whole file.
t/annotate-tests.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index b5ceba4..87403da 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -113,7 +113,8 @@ test_expect_success \
test_expect_success \
'some edit' \
- 'perl -p -i.orig -e "s/^1A.*\n$//; s/^3A/99/" file &&
+ 'mv file file.orig &&
+ sed -e "s/^3A/99/" -e "/^1A/d" < file.orig > file &&
GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
test_expect_success \
--
1.5.0.rc3.72.g4005