test fixes for Solaris 2.6
authorTK Soh <teekaysoh@yahoo.com>
Thu, 18 Aug 2005 13:33:39 +0100
changeset 949 d997148155f2
parent 940 1300271ba8de
child 950 fbaf0380efd1
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.
tests/test-diffdir
tests/test-merge-revert2
tests/test-up-local-change
--- a/tests/test-diffdir
+++ b/tests/test-diffdir
@@ -7,6 +7,8 @@ hg ci -m "a" -d "0 0"
 
 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
+++ b/tests/test-merge-revert2
@@ -27,7 +27,8 @@ hg id
 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
+++ b/tests/test-up-local-change
@@ -12,8 +12,8 @@ hg clone . ../r2
 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
 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/"