Mercurial > hg
changeset 949:d997148155f2
test fixes for Solaris 2.6
Solaris 2.6's stock sed doesn't support alternatives in regular
expression. We workaround by breaking up the regexp.
| author | TK Soh <teekaysoh@yahoo.com> |
|---|---|
| date | Thu, 18 Aug 2005 13:33:39 +0100 |
| parents | 1300271ba8de |
| children | fbaf0380efd1 |
| files | tests/test-diffdir tests/test-merge-revert2 tests/test-up-local-change |
| diffstat | 3 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-diffdir Wed Aug 17 18:52:27 2005 -0800 +++ b/tests/test-diffdir Thu Aug 18 13:33:39 2005 +0100 @@ -7,6 +7,8 @@ echo 123 > b hg add b -hg diff | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" +hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -hg diff -r tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" +hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
--- a/tests/test-merge-revert2 Wed Aug 17 18:52:27 2005 -0800 +++ b/tests/test-merge-revert2 Thu Aug 18 13:33:39 2005 +0100 @@ -27,7 +27,8 @@ hg update -C 0 echo "changed file1 different" >> file1 HGMERGE=merge hg update -hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" +hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg status hg id hg revert
--- a/tests/test-up-local-change Wed Aug 17 18:52:27 2005 -0800 +++ b/tests/test-up-local-change Thu Aug 18 13:33:39 2005 +0100 @@ -12,8 +12,8 @@ cd ../r2 hg up echo abc > a -hg diff > ../d -sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d +hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" cd ../r1 echo b > b @@ -28,6 +28,6 @@ hg --debug up -m hg parents hg -v history -hg diff > ../d -sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d +hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"